Update manifest.json

Kajitsy · Feb 10, 2024 · d9dc2b8 · d9dc2b8
1 parent 9f49307
commit d9dc2b8
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/firefox/manifest.json b/firefox/manifest.json
@@ -1,11 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Genshin/Star Rail CodeEntter",
-<<<<<<< HEAD
   "version": "2.2.4.6",
-=======
-  "version": "2.2.4.5",
->>>>>>> af5cb227efc6240b0d5f7d967e8f378426421d18
   "description": "__MSG_extensionDescription__",
   "default_locale": "en",
   "icons": {