From c3debba6c2334fba6ace5159a219ea84b290949c Mon Sep 17 00:00:00 2001
From: AramJonghu <aramjonghu@tutamail.com>
Date: Thu, 21 May 2026 21:02:59 +0200
Subject: [PATCH] added eslint in npm

---
 frontend/package.json | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/frontend/package.json b/frontend/package.json
index e6f9865..6df31d0 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,4 +1,5 @@
 {
+<<<<<<< HEAD
   "name": "aramjonghu-site",
   "private": true,
   "version": "0.0.0",
@@ -34,4 +35,42 @@
     "prettier": "^3.8.3",
     "vite": "^8.0.4"
   }
+=======
+    "name": "aramjonghu-site",
+    "private": true,
+    "version": "0.0.0",
+    "type": "module",
+    "scripts": {
+        "dev": "vite",
+        "build": "vite build",
+        "lint": "eslint .",
+        "preview": "vite preview"
+    },
+    "dependencies": {
+        "@tailwindcss/vite": "^4.2.2",
+        "react": "^19.2.4",
+        "react-dom": "^19.2.4",
+        "react-markdown": "^10.1.0",
+        "rehype-raw": "^7.0.0",
+        "rehype-sanitize": "^6.0.0",
+        "tailwindcss": "^4.2.2"
+    },
+    "devDependencies": {
+        "@babel/core": "^7.29.0",
+        "@catppuccin/tailwindcss": "^1.0.0",
+        "@eslint/js": "^9.39.4",
+        "@rolldown/plugin-babel": "^0.2.2",
+        "@types/react": "^19.2.14",
+        "@types/react-dom": "^19.2.3",
+        "@vitejs/plugin-react": "^6.0.1",
+        "babel-plugin-react-compiler": "^1.0.0",
+        "eslint": "^9.39.4",
+        "eslint-plugin-react-hooks": "^7.0.1",
+        "eslint-plugin-react-refresh": "^0.5.2",
+        "globals": "^17.4.0",
+        "prettier": "^3.8.3",
+        "vite": "^8.0.4",
+        "vscode-langservers-extracted": "^4.10.0"
+    }
+>>>>>>> c86f713 (added eslint in npm)
 }