Fixing examples for Linter errors

documentation/Semantic-and-Model-Violations-Reference.md

@@ -892,7 +892,11 @@ This document lists the set of automated rules that can be validated against swa
 
 **Description**: Long running operation must return location header or azure-AsyncOperation header in response when this operation is annotated with x-ms-long-running-operation:true.
 
+<<<<<<< HEAD
+**How to fix the violation**: Adding one of these headers to the response. Refer to this [example](https://github.com/Azure/azure-rest-api-specs/blob/5e638554b6/specification/appplatform/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/examples/Apps_Update.json#L64) for the fix. 
+=======
 **How to fix the violation**: Adding one of these headers to the response in example or in traffic payload. Refer to this [example](https://github.com/Azure/azure-rest-api-specs/blob/5e638554b6/specification/appplatform/resource-manager/Microsoft.AppPlatform/stable/2020-07-01/examples/Apps_Update.json#L64) for the fix.
+>>>>>>> 72664c83300dfaf6782e22822a5aae0b0df92735
 
 ### <a name="MISSING_RESOURCE_ID" />MISSING_RESOURCE_ID
 

profile/2020-09-01-hybrid.json

@@ -670,6 +670,14 @@
         }
       ]
     },
+    "microsoft.containerregistry": {
+      "2019-08-15-preview": [
+        {
+          "resourceType": "*",
+          "path": "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2019-08-15/containerregistry.json"
+        }
+      ]
+    },
     "microsoft.storage": {
       "resourceType": "*",
       "2019-07-07": []