From d2ec920aee2ce44c0c01998825ca6b2d387e8d66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AD=A6=E6=B5=A9=E7=84=B6?= <1252198830@qq.com>
Date: Thu, 8 Sep 2022 11:43:52 +0800
Subject: [PATCH] fix residual merge info

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

diff --git a/package-lock.json b/package-lock.json
index ea5b4f049..b6c52a4f4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -29948,15 +29948,6 @@
         "cross-env": "^7.0.3",
         "eslint": "^8.3.0",
         "eslint-config-react-app": "^7.0.0",
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< HEAD
->>>>>>> f21e2137 (Publish)
-=======
->>>>>>> 9f8d75e5 (chore(lint): lint all files)
->>>>>>> fb003998 (chore(lint): lint all files)
->>>>>>> f301bfe4 (chore(lint): lint all files)
         "flow-bin": "^0.116.0",
         "html-entities": "^2.3.2",
         "jest": "^27.4.3",
@@ -47337,19 +47328,6 @@
         "chalk": "^4.1.2",
         "chokidar": "^3.5.2",
         "cross-env": "^7.0.3",
-<<<<<<< HEAD
-        "eslint": "^8.3.0",
-        "eslint-config-react-app": "^7.0.0",
-=======
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-        "eslint": "^8.3.0",
-        "eslint-config-react-app": "^7.0.0",
-=======
->>>>>>> 9f8d75e5 (chore(lint): lint all files)
->>>>>>> fb003998 (chore(lint): lint all files)
->>>>>>> f301bfe4 (chore(lint): lint all files)
         "flow-bin": "^0.116.0",
         "html-entities": "^2.3.2",
         "jest": "^27.4.3",
-- 
GitLab