deleted autoinserted code caused by git merge

2025-08-09 01:16:03 -07:00
parent 51393188fb
commit c154a84058
1 changed files with 0 additions and 4 deletions
--- 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>