From d3b3d3abe2aca08c25584bf90fcab308bc50c212 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Fri, 22 Jul 2022 15:59:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/package-lock.json b/package-lock.json
index be5899f3..51184f15 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27956,11 +27956,7 @@
     },
     "flv.js": {
       "version": "1.6.2",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmmirror.com/flv.js/-/flv.js-1.6.2.tgz",
-=======
       "resolved": "https://registry.npmjs.org/flv.js/-/flv.js-1.6.2.tgz",
->>>>>>> 32846230ee3a311bde67fa2c33075b4a2cda57ce
       "integrity": "sha512-xre4gUbX1MPtgQRKj2pxJENp/RnaHaxYvy3YToVVCrSmAWUu85b9mug6pTXF6zakUjNP2lFWZ1rkSX7gxhB/2A==",
       "requires": {
         "es6-promise": "^4.2.8",