From a6c4b39d65429501e1f1e1fefa0f2d99e628f77b Mon Sep 17 00:00:00 2001
From: Slava Leleka <v.leleka@adguard.com>
Date: Thu, 20 Feb 2025 14:57:51 -0500
Subject: [PATCH] merge the parent branch into the current branch, resolve
 conflicts

---
 package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package.json b/package.json
index 81f19f3c4c..520dc01f1c 100644
--- 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": {