From 91a1edbd53da2b1580cccd645e77faacdad5eb23 Mon Sep 17 00:00:00 2001
From: Yovan Martinez <martinezyovam@gmail.com>
Date: Mon, 16 May 2022 17:55:50 -0400
Subject: [PATCH] eliminado codigo basura

---
 src/main/webapp/index.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
index 2a4e0d0..3f8c3c9 100644
--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@ -26,11 +26,10 @@
 
         <ul>
             <li class="link-menu"><a href="">Home</a></li>
-<<<<<<< HEAD
+
             <li class="link-menu"><a href="bootcamp.jsp">Postulate</a></li>
             <li class="link-menu"><a href="formulario_bootcamp.jsp">Crear bootcamp</a></li>
             <li class="link-menu"><a href="manage_postulantes.jsp">Manage Postulantes(perdon angel)</a></li>
-=======
             <li class="link-menu"><a href="formulario.jsp">Postulate</a></li>
             <li class="link-menu"><a href="formulario_bootcamp.jsp">Crear bootcamp</a>
             <li class="link-menu"><a href="login.jsp">Login</a>
@@ -40,7 +39,7 @@
             </li>
             <li class="link-menu"><a href="formulario_profesor.jsp">Crear profesor</a>
             </li>
->>>>>>> 9f750c7a848792df924b81bbb2c48da70f9d8765
+
         </ul>
 
     </div>
--
libgit2 0.26.0