1 files changed, 0 insertions, 32 deletions
diff --git a/package.json b/package.json
index b18b597..96facd6 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
   "name": "react-test",
   "version": "0.1.0",
   "private": true,
@@ -46,36 +45,5 @@
   },
   "devDependencies": {
     "tailwindcss": "^3.4.3"
-=======
-  "name": "helping-hands",
-  "version": "0.1.0",
-  "private": true,
-  "scripts": {
-    "dev": "next dev",
-    "build": "next build",
-    "start": "next start"
-  },
-  "dependencies": {
-    "@emotion/css": "^11.10.6",
-    "@emotion/react": "^11.10.6",
-    "@emotion/server": "^11.10.0",
-    "@emotion/styled": "^11.10.6",
-    "@headlessui/react": "^1.7.14",
-    "@heroicons/react": "^2.0.17",
-    "@tailwindcss/aspect-ratio": "^0.4.2",
-    "dotenv": "^16.4.5",
-    "next": "^13.3.1",
-    "next-auth": "^4.24.7",
-    "next-themes": "^0.2.1",
-    "react": "^18",
-    "react-dom": "^18",
-    "react-hook-form": "^7.43.9"
-  },
-  "devDependencies": {
-    "autoprefixer": "^10.4.14",
-    "eslint-config-prettier": "^8.8.0",
-    "postcss": "^8.4.23",
-    "tailwindcss": "^3.3.1"
->>>>>>> ccf52d88eb60f518cc3e5bb3ce2b21bbb6858337
   }
 }