From cd8b5c5a3d324e2eb634d18907a4b54d3c39a36a Mon Sep 17 00:00:00 2001
From: Cori1109 <chris.jenkins.j1005@gmail.com>
Date: Fri, 27 Aug 2021 01:05:28 +0530
Subject: [PATCH] package-lock fixed

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

diff --git a/package-lock.json b/package-lock.json
index f8694ac..d4c0f08 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5714,20 +5714,11 @@
       }
     },
     "dom-helpers": {
-<<<<<<< HEAD
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz",
       "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==",
       "requires": {
         "@babel/runtime": "^7.1.2"
-=======
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
-      "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
-      "requires": {
-        "@babel/runtime": "^7.8.7",
-        "csstype": "^3.0.2"
->>>>>>> d576f02197db7daa96d47b140c029f5260131eca
       }
     },
     "dom-serializer": {
@@ -17443,5 +17434,4 @@
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
     }
   }
-}
 }
\ No newline at end of file