From 380fd6298fc90369c1604321516fdaf0a0a0a330 Mon Sep 17 00:00:00 2001
From: Nagesh Pai <nagesh.pai@automattic.com>
Date: Fri, 7 Oct 2022 09:54:52 +0530
Subject: [PATCH] update package.json

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

diff --git a/package-lock.json b/package-lock.json
index d9c3e8f93da..366891716b7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,11 +6,7 @@
   "packages": {
     "": {
       "name": "woocommerce-payments",
-<<<<<<< HEAD
       "version": "4.8.1",
-=======
-      "version": "4.8.0",
->>>>>>> 5e088530 (Update WC Pay)
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {