Resolve conflicts and install all dependencies

WildCodeSchool · Dec 19, 2023 · e6e5a3b · e6e5a3b
1 parent 38f54ad
commit e6e5a3b
Show file tree

Hide file tree

Showing 2 changed files with 80 additions and 16 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -11,11 +11,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-router-dom": "^6.14.2",
-<<<<<<< HEAD
     "uuid": "^9.0.1"
-=======
-    "sass": "^1.69.5"
->>>>>>> bcc8ae1a3a6b036af57fc4edd0ef3efd1a7fb974
   },
   "devDependencies": {
     "@vitejs/plugin-react": "^4.0.3",