fix: conflict

wazuh · Dec 13, 2024 · a61541a · a61541a
1 parent d3eec6c
commit a61541a
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -7,13 +7,8 @@
     "templateVersion": "2.16.0"
   },
   "wazuh": {
-<<<<<<< HEAD
     "version": "4.10.1",
     "revision": "00"
-=======
-    "version": "4.10.0",
-    "revision": "06"
->>>>>>> a05a8dedd2ca5e085813ed094703a3d0db21191f
   },
   "license": "Apache-2.0",
   "homepage": "https://github.com/opensearch-project/security-dashboards-plugin",