Skip to content

Commit 6cd0f0d

Browse files
committed
removed conflicts in index.html
1 parent 198602e commit 6cd0f0d

File tree

1 file changed

+0
-16
lines changed

1 file changed

+0
-16
lines changed

index.html

-16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<<<<<<< HEAD
21
<!DOCTYPE html>
32
<html lang="en">
43
<head>
@@ -12,19 +11,4 @@
1211
<div id="root"></div>
1312
<script type="module" src="./src/main.tsx"></script>
1413
</body>
15-
=======
16-
<!doctype html>
17-
<html lang="en">
18-
<head>
19-
<meta charset="UTF-8" />
20-
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
21-
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
22-
<title>Akhil Devarasetty | CSE Student & Developer</title>
23-
<meta name="description" content="Personal website of Akhil Devarasetty - Computer Science and Engineering Student">
24-
</head>
25-
<body>
26-
<div id="root"></div>
27-
<script type="module" src="/src/main.tsx"></script>
28-
</body>
29-
>>>>>>> dev
3014
</html>

0 commit comments

Comments
 (0)