Resolve conflicts

v-xuto · v-xuto · commit 8835e0e9c2c5 · 2025-10-31T16:01:16.000+08:00
diff --git a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/ResourceConnector/stable/2022-10-27/appliances.json b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/ResourceConnector/stable/2022-10-27/appliances.json
@@ -321,8 +321,6 @@
           "Create/Update Appliance": {
             "$ref": "./examples/AppliancesCreate_Update.json"
           }
-<<<<<<< HEAD:specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/stable/2022-10-27/appliances.json
-=======
         }
       },
       "delete": {
@@ -359,7 +357,6 @@
               "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse"
             }
           }
->>>>>>> origin/main:specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/ResourceConnector/stable/2022-10-27/appliances.json
         },
         "x-ms-long-running-operation-options": {
           "final-state-via": "azure-async-operation",

Original file line number	Diff line number	Diff line change
`@@ -321,8 +321,6 @@`
`321`	`321`	`"Create/Update Appliance": {`
`322`	`322`	`"$ref": "./examples/AppliancesCreate_Update.json"`
`323`	`323`	`}`
`324`		`-<<<<<<< HEAD:specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/stable/2022-10-27/appliances.json`
`325`		`-=======`
`326`	`324`	`}`
`327`	`325`	`},`
`328`	`326`	`"delete": {`
`@@ -359,7 +357,6 @@`
`359`	`357`	`"$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse"`
`360`	`358`	`}`
`361`	`359`	`}`
`362`		`->>>>>>> origin/main:specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/ResourceConnector/stable/2022-10-27/appliances.json`
`363`	`360`	`},`
`364`	`361`	`"x-ms-long-running-operation-options": {`
`365`	`362`	`"final-state-via": "azure-async-operation",`