chore(NA): solve conflicts with the upstream branch

mistic · mistic · commit 7fdd25901b8b · 2020-11-18T22:02:35.000Z
diff --git a/examples/search_examples/kibana.json b/examples/search_examples/kibana.json
@@ -1,11 +1,7 @@
 {
   "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"],
