Skip to content

Commit 023e796

Browse files
authored
Merge pull request #294 from shootermv/main
chore: fix falling ci
2 parents b0ca9c5 + 4b82428 commit 023e796

2 files changed

Lines changed: 157 additions & 149 deletions

File tree

beta/package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,7 @@
3333
"debounce": "^1.2.1",
3434
"ga-lite": "^2.1.4",
3535
"github-slugger": "^1.3.0",
36-
<<<<<<< HEAD
3736
"next": "^12.1.0",
38-
=======
39-
"next": "^12.0.10",
40-
>>>>>>> 84ad3308338e2bb819f4f24fa8e9dfeeffaa970b
4137
"parse-numeric-range": "^1.2.0",
4238
"react": "experimental",
4339
"react-collapsed": "3.1.0",

0 commit comments

Comments
 (0)