Fix schema definitions after resolving the conflict

rogyar · rogyar · commit e2cad8915ce3 · 2018-09-26T15:01:23.000+02:00
diff --git a/app/code/Magento/UrlRewriteGraphQl/etc/schema.graphqls b/app/code/Magento/UrlRewriteGraphQl/etc/schema.graphqls
@@ -8,8 +8,7 @@ type EntityUrl @doc(description: "EntityUrl is an output object containing the `
 }
 
 type Query {
-    urlResolver(url: String!): EntityUrl @resolver(class: "Magento\\UrlRewriteGraphQl\\Model\\Resolver\\UrlRewrite") @doc(description: "The urlResolver query returns the relative URL for a specified product, category or CMS page")
-    urlResolver(url: String!): EntityUrl @resolver(class: "Magento\\UrlRewriteGraphQl\\Model\\Resolver\\EntityUrl") @doc(description: "The urlResolver query returns the canonical URL for a specified product, category or CMS page")
+    urlResolver(url: String!): EntityUrl @resolver(class: "Magento\\UrlRewriteGraphQl\\Model\\Resolver\\EntityUrl") @doc(description: "The urlResolver query returns the relative URL for a specified product, category or CMS page")
 }
 
 enum UrlRewriteEntityTypeEnum {

Original file line number	Diff line number	Diff line change
@@ -8,8 +8,7 @@ type EntityUrl @doc(description: "EntityUrl is an output object containing the `
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`type Query {`
`11`		`- urlResolver(url: String!): EntityUrl @resolver(class: "Magento\\UrlRewriteGraphQl\\Model\\Resolver\\UrlRewrite") @doc(description: "The urlResolver query returns the relative URL for a specified product, category or CMS page")`
`12`		`- urlResolver(url: String!): EntityUrl @resolver(class: "Magento\\UrlRewriteGraphQl\\Model\\Resolver\\EntityUrl") @doc(description: "The urlResolver query returns the canonical URL for a specified product, category or CMS page")`
	`11`	`+ urlResolver(url: String!): EntityUrl @resolver(class: "Magento\\UrlRewriteGraphQl\\Model\\Resolver\\EntityUrl") @doc(description: "The urlResolver query returns the relative URL for a specified product, category or CMS page")`
`13`	`12`	`}`
`14`	`13`
`15`	`14`	`enum UrlRewriteEntityTypeEnum {`