update backport

elastic · Feb 25, 2021 · 8f53826 · 8f53826
1 parent 24d46ad
commit 8f53826
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/...ns/console/server/lib/spec_definitions/json/generated/cluster.get_component_template.json b/...ns/console/server/lib/spec_definitions/json/generated/cluster.get_component_template.json
@@ -12,5 +12,6 @@
       "_component_template",
       "_component_template/{name}"
     ],
-    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/getting-component-templates.html"  }
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/getting-component-templates.html"
+  }
 }
diff --git a/...ns/console/server/lib/spec_definitions/json/overrides/cluster.put_component_template.json b/...ns/console/server/lib/spec_definitions/json/overrides/cluster.put_component_template.json
@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
   "cluster.put_component_template": {
     "data_autocomplete_rules": {
       "settings": {
@@ -15,17 +14,6 @@
       "mappings": {
         "__scope_link": "put_mapping"
       }
-=======
-  "indices.put_template": {
-    "data_autocomplete_rules": {
-      "template": {},
-      "aliases": {},
-      "settings": {},
-      "mappings": {},
-      "version": 0,
-      "_meta": {},
-      "allow_auto_create": false
->>>>>>> 06d966eca57... [Console] Autocompletion of component_templates (#91180)
     }
   }
 }