Skip to content

Commit 1b0e035

Browse files
DDH2004DDH2004
committed
Remove conflicting entries for gh-pages in package.json and package-lock.json
1 parent 0135211 commit 1b0e035

File tree

2 files changed

+0
-8
lines changed

2 files changed

+0
-8
lines changed

‎package-lock.json

-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

-4
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
8-
<<<<<<< HEAD
98
"build": "tsc && vite build",
10-
=======
11-
"build": "vite build",
12-
>>>>>>> dev
139
"lint": "eslint .",
1410
"preview": "vite preview"
1511
},

0 commit comments

Comments
 (0)