From 20df1eceb13a5fb6c40d9a2382d526201c82407c Mon Sep 17 00:00:00 2001
From: Muhammad Ibrahim <iby@9.technology>
Date: Mon, 29 Sep 2025 15:38:07 +0100
Subject: [PATCH] Resolve merge conflict - use v1-2-7 version

---
 frontend/package.json | 46 -------------------------------------------
 1 file changed, 46 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 98dec3e..606034b 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -41,50 +41,4 @@
 	"overrides": {
 		"esbuild": "^0.25.10"
 	}
-=======
-  "name": "patchmon-frontend",
-  "private": true,
-  "version": "1.2.6",
-  "type": "module",
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build",
-    "lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
-    "preview": "vite preview"
-  },
-  "dependencies": {
-    "@dnd-kit/core": "^6.3.1",
-    "@dnd-kit/sortable": "^10.0.0",
-    "@dnd-kit/utilities": "^3.2.2",
-    "@tanstack/react-query": "^5.87.4",
-    "axios": "^1.6.2",
-    "chart.js": "^4.4.0",
-    "clsx": "^2.0.0",
-    "cors": "^2.8.5",
-    "date-fns": "^2.30.0",
-    "express": "^4.18.2",
-    "http-proxy-middleware": "^2.0.6",
-    "lucide-react": "^0.544.0",
-    "react": "^18.2.0",
-    "react-chartjs-2": "^5.2.0",
-    "react-dom": "^18.2.0",
-    "react-icons": "^5.5.0",
-    "react-router-dom": "^6.20.1"
-  },
-  "devDependencies": {
-    "@types/react": "^18.2.37",
-    "@types/react-dom": "^18.2.15",
-    "@vitejs/plugin-react": "^5.0.0",
-    "autoprefixer": "^10.4.16",
-    "eslint": "^8.53.0",
-    "eslint-plugin-react": "^7.33.2",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-react-refresh": "^0.4.4",
-    "postcss": "^8.4.32",
-    "tailwindcss": "^3.3.6",
-    "vite": "^7.1.5"
-  },
-  "overrides": {
-    "esbuild": "^0.25.10"
-  }
 }