Wed Apr 5 04:45:00 UTC 2023 inscode

56345a57 · 622eda98dfef6c4fdb84ccca · bfe82eeb · 56345a57 · 56345a57
隐藏空白更改
内联并排

Showing with 1 addition and 5 deletion

.upm/store.json .upm/store.json +1 -1

package.json package.json +0 -4

未找到文件。
--- a/.upm/store.json
+++ b/.upm/store.json
-{"version":2,"languages":{"nodejs-yarn":{"specfileHash":"abab35c9ba66256c189aa42c5e29aa02","lockfileHash":"b4fe953f33f9be5c0086b24be0e7aad5"}}}
+{"version":2,"languages":{"nodejs-yarn":{"specfileHash":"88b15dbac007735f98d1d471fe729c93","lockfileHash":"b4fe953f33f9be5c0086b24be0e7aad5"}}}
--- a/package.json
+++ b/package.json
@@ -6,11 +6,7 @@
  "description": "Minecraft clone made with Three.js and TypeScript",
  "scripts": {
    "dev": "vite",
-<<<<<<< HEAD
-    "build": "vite build",
-=======
    "build": "vite build --base=/dist/",
->>>>>>> 8e27e4d91d171fdca6522f4297ff30d0fdedccd0
    "preview": "vite preview --port 8080",
    "lint": "tsc --noEmit"
  },