fix(NA): search examples kibana version declaration (elastic#83182)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> # Conflicts: # examples/search_examples/kibana.json
mistic · Nov 18, 2020 · e4ffbcf · e4ffbcf
1 parent 154bb1a
commit e4ffbcf
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/examples/search_examples/kibana.json b/examples/search_examples/kibana.json
@@ -1,6 +1,11 @@
 {
   "id": "searchExamples",
+<<<<<<< HEAD
   "version": "7.10.1",
+=======
+  "version": "0.0.1",
+  "kibanaVersion": "kibana",
+>>>>>>> a2d288d134c... fix(NA): search examples kibana version declaration (#83182)
   "server": true,
   "ui": true,
   "requiredPlugins": ["navigation", "data", "developerExamples"],