Resolve conflicts

kir-dev · Sep 18, 2024 · de0a95f · de0a95f
2 parents a7e2ef7 + 3b58bea
commit de0a95f
Show file tree

Hide file tree

Showing 2 changed files with 397 additions and 273 deletions.
diff --git a/apps/frontend/package.json b/apps/frontend/package.json
@@ -12,10 +12,11 @@
     "lint": "next lint"
   },
   "dependencies": {
+    "@radix-ui/react-switch": "^1.1.0",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.0",
     "lucide-react": "^0.372.0",
-    "next": "14.2.2",
+    "next": "14.2.10",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "tailwind-merge": "^2.3.0",
@@ -25,9 +26,9 @@
     "@types/node": "^20.12.7",
     "@types/react": "^18.2.79",
     "@types/react-dom": "^18.2.25",
+    "eslint-plugin-react": "^7.34.1",
     "postcss": "^8.4.38",
     "tailwindcss": "^3.4.3",
-    "typescript": "^5.4.5",
-    "eslint-plugin-react": "^7.34.1"
+    "typescript": "^5.4.5"
   }
 }