fixing bad merge

matthchr · Mar 29, 2017 · 9d6f47a · 9d6f47a
1 parent b0e01c8
commit 9d6f47a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 49 deletions.
diff --git a/arm-eventhub/2015-08-01/swagger/EventHub.json b/arm-eventhub/2015-08-01/swagger/EventHub.json
@@ -1518,11 +1518,7 @@
         "secondaryKey": {
           "type": "string",
           "readOnly": true,
-<<<<<<< HEAD
-          "description": "A base64-encoded 256-bit primary key for signing and validating the SAS token."
-=======
           "description": "A base64-encoded 256-bit secondary key for signing and validating the SAS token."
->>>>>>> cd32a50003b5f95307f849cb770ed3b2f66a85a4
         },
         "keyName": {
           "type": "string",

diff --git a/arm-sql/2014-04-01/swagger/sql.core.json b/arm-sql/2014-04-01/swagger/sql.core.json
@@ -308,6 +308,9 @@
           {
             "$ref": "#/parameters/ServerNameParameter"
           },
+          {
+            "$ref": "#/parameters/DatabaseExpandParameter"
+          },
           {
             "name": "$filter",
             "in": "query",
@@ -2752,7 +2755,6 @@
       },
       "description": "Represents a Slo Usage Metric."
     },
-
     "OperationImpact": {
       "properties": {
         "name": {
@@ -3103,49 +3105,6 @@
         }
       }
     },
-    "Operation": {
-      "description": "SQL REST API operation definition.",
-      "type": "object",
-      "properties": {
-        "name": {
-          "description": "Operation name: {provider}/{resource}/{operation}",
-          "type": "string"
-        },
-        "display": {
-          "description": "Display metadata associated with the operation.",
-          "properties": {
-            "provider": {
-              "description": "Service provider: Microsoft SQL Database.",
-              "type": "string"
-            },
-            "resource": {
-              "description": "Resource on which the operation is performed: Server, Database, etc.",
-              "type": "string"
-            },
-            "operation": {
-              "description": "Type of operation: get, read, delete, etc.",
-              "type": "string"
-            }
-          }
-        }
-      }
-    },
-    "OperationListResult": {
-     "description": "Result of the request to list SQL operations. It contains a list of operations and a URL link to get the next set of results.",
-      "properties": {
-        "value": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/Operation"
-          },
-          "description": "List of SQL operations supported by the SQL resource provider."
-        },
-        "nextLink": {
-          "type": "string",
-          "description": "URL to get the next set of operation list results if there are any."
-        }
-      }
-    },
     "Operation": {
       "description": "SQL REST API operation definition.",
       "type": "object",
@@ -3214,4 +3173,4 @@
       "x-ms-parameter-location": "method"
     }
   }
-}
+}