gorgo-cpu
diff --git a/‎package-lock.json‎
Lines changed: 2 additions & 3 deletions b/‎package-lock.json‎
Lines changed: 2 additions & 3 deletions
diff --git a/‎package.json‎
Lines changed: 0 additions & 3 deletions b/‎package.json‎
Lines changed: 0 additions & 3 deletions
@@ -13,13 +13,10 @@
   },
   "devDependencies": {
     "@vitejs/plugin-react": "4.3",
-<<<<<<< HEAD
     "vite": "^5.2.0",
     "vite-plugin-restart": "^0.4.2",
     "tailwindcss": "^^3.4.1",
     "postcss": "^8.4.21",
-=======
->>>>>>> ca4b604 (newest improvements)
     "autoprefixer": "^10.4.13",
     "gh-pages": "^5.0.0",
     "postcss": "^8.4.21",