From cb9e60d681e676594dad06e8761d749010fe5097 Mon Sep 17 00:00:00 2001
From: jaywcjlove <398188662@qq.com>
Date: Tue, 7 Sep 2021 02:38:40 +0800
Subject: [PATCH] fix: Merge conflict detected in package.json

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

diff --git a/package.json b/package.json
index a95c76d43..7ab52a25b 100644
--- a/package.json
+++ b/package.json
@@ -44,16 +44,11 @@
     "codemirror": ">=5.49.2"
   },
   "dependencies": {
-<<<<<<< HEAD
     "@babel/runtime": "7.15.4",
-    "codemirror": "5.62.3"
-=======
-    "@babel/runtime": "7.15.3",
     "@codemirror/basic-setup": "0.19.0",
     "@codemirror/state": "0.19.1",
     "@codemirror/theme-one-dark": "0.19.0",
     "@codemirror/view": "0.19.4"
->>>>>>> fc5bf4d5 (feat: Use codemirror 6. #88)
   },
   "eslintConfig": {
     "extends": [