merge the parent branch into the current branch, resolve conflicts

AdguardTeam · Feb 20, 2025 · a6c4b39 · a6c4b39
1 parent 2105e6a
commit a6c4b39
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "browser-extension",
-<<<<<<< HEAD
   "version": "5.2.0",
-=======
-  "version": "5.1.51",
->>>>>>> master
   "description": "AdGuard Extension",
   "type": "module",
   "scripts": {