From 56345a578a65b527a3c987611f934577aab367cf Mon Sep 17 00:00:00 2001
From: 622eda98dfef6c4fdb84ccca <622eda98dfef6c4fdb84ccca@devide>
Date: Wed, 5 Apr 2023 04:45:00 +0000
Subject: [PATCH] Wed Apr  5 04:45:00 UTC 2023 inscode

---
 .upm/store.json | 2 +-
 package.json    | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.upm/store.json b/.upm/store.json
index be7f137..de88213 100644
--- a/.upm/store.json
+++ b/.upm/store.json
@@ -1 +1 @@
-{"version":2,"languages":{"nodejs-yarn":{"specfileHash":"abab35c9ba66256c189aa42c5e29aa02","lockfileHash":"b4fe953f33f9be5c0086b24be0e7aad5"}}}
+{"version":2,"languages":{"nodejs-yarn":{"specfileHash":"88b15dbac007735f98d1d471fe729c93","lockfileHash":"b4fe953f33f9be5c0086b24be0e7aad5"}}}
diff --git a/package.json b/package.json
index 5ea06b2..874c9c6 100644
--- 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"
   },
-- 
GitLab