From c154a84058a5948004981be4e41b6ba45a6eb0cf Mon Sep 17 00:00:00 2001
From: Petruspistor <connect+git@petruspistor.com>
Date: Sat, 9 Aug 2025 01:16:03 -0700
Subject: [PATCH] deleted autoinserted code caused by git merge

---
 index.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/index.html b/index.html
index 3c19176..8751e10 100644
--- a/index.html
+++ b/index.html
@@ -22,9 +22,6 @@
             <li>Projects</li>
             <li>Contact</li>
         </ul>
-<<<<<<< HEAD
-    </nav>
-=======
     </nav>-->
 
     <main>
@@ -43,6 +40,5 @@
             </p>
         </article>
     </main>
->>>>>>> c8000e41cc15a76985524dc31fcd32ba8e56f6f8
 </body>
 </html>