Skip to content

Commit cb9e60d

Browse files
committed
fix: Merge conflict detected in package.json
1 parent 1739514 commit cb9e60d

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,11 @@
4444
"codemirror": ">=5.49.2"
4545
},
4646
"dependencies": {
47-
<<<<<<< HEAD
4847
"@babel/runtime": "7.15.4",
49-
"codemirror": "5.62.3"
50-
=======
51-
"@babel/runtime": "7.15.3",
5248
"@codemirror/basic-setup": "0.19.0",
5349
"@codemirror/state": "0.19.1",
5450
"@codemirror/theme-one-dark": "0.19.0",
5551
"@codemirror/view": "0.19.4"
56-
>>>>>>> fc5bf4d5 (feat: Use codemirror 6. #88)
5752
},
5853
"eslintConfig": {
5954
"extends": [

0 commit comments

Comments
 (0)