From 8348fedf9bf962e2c941241c920f9792951bd6f2 Mon Sep 17 00:00:00 2001
From: Tronax <mail@janikdietz.de>
Date: Fri, 15 May 2026 21:18:20 +0200
Subject: [PATCH] Typo Fix

---
 manifest.json | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/manifest.json b/manifest.json
index c095b4b..0ce30d5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,6 @@
 {
   "manifest_version": 3,
   "name": "Volume Booster",
-<<<<<<< HEAD
   "version": "1.0",
   "description": "Boost audio up to 600%",
   "permissions": ["activeTab", "storage"],
@@ -14,8 +13,7 @@
       "matches": ["<all_urls>"],
       "js": ["content.js"]
     }
-  ]
-=======
+  ],
   "author": "Tronax mail@tronax.dev",
   "version": "1.0.0",
   "description": "Boost or lower the volume of any browser tab — up to 600%. Mit schönem Interface.",
@@ -39,5 +37,4 @@
   "background": {
     "service_worker": "background.js"
   }
->>>>>>> 2056a0d (First Commit, Code by Claude 4.7 Opus)
 }