DDH2004
diff --git a/‎.gitignore‎
Lines changed: 5 additions & 1 deletion b/‎.gitignore‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎index.html‎
Lines changed: 16 additions & 0 deletions b/‎index.html‎
Lines changed: 16 additions & 0 deletions
diff --git a/‎package-lock.json‎
Lines changed: 60 additions & 0 deletions b/‎package-lock.json‎
Lines changed: 60 additions & 0 deletions
diff --git a/‎package.json‎
Lines changed: 7 additions & 0 deletions b/‎package.json‎
Lines changed: 7 additions & 0 deletions
@@ -1 +1,5 @@
-node_modules
+<<<<<<< HEAD
+node_modules
+=======
+node_modules
+>>>>>>> dev
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -11,4 +12,19 @@
   <div id="root"></div>
   <script type="module" src="./src/main.tsx"></script>
 </body>
+=======
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Akhil Devarasetty | CSE Student & Developer</title>
+    <meta name="description" content="Personal website of Akhil Devarasetty - Computer Science and Engineering Student">
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/main.tsx"></script>
+  </body>
+>>>>>>> dev
 </html>
@@ -5,7 +5,11 @@
   "type": "module",
   "scripts": {
     "dev": "vite",
+<<<<<<< HEAD
     "build": "tsc && vite build",
+=======
+    "build": "vite build",
+>>>>>>> dev
     "lint": "eslint .",
     "preview": "vite preview"
   },
@@ -32,7 +36,10 @@
     "eslint": "^9.9.1",
     "eslint-plugin-react-hooks": "^5.1.0-rc.0",
     "eslint-plugin-react-refresh": "^0.4.11",
+<<<<<<< HEAD
     "gh-pages": "^6.3.0",
+=======
+>>>>>>> dev
     "globals": "^15.9.0",
     "postcss": "^8.4.35",
     "tailwindcss": "^3.4.1",