From d9dc2b8ef05167bdb8ee549da020bbebad746f14 Mon Sep 17 00:00:00 2001
From: Kajitsy <kajitsy@mail.ru>
Date: Sat, 10 Feb 2024 15:24:30 +0300
Subject: [PATCH] Update manifest.json

---
 firefox/manifest.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/firefox/manifest.json b/firefox/manifest.json
index 8c9716b..a3a7582 100644
--- 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": {