From 8b0f331a41960830aa4ba11501b118bf96147981 Mon Sep 17 00:00:00 2001
From: Paula <paula_robayo0104@hotmail.com>
Date: Wed, 3 Feb 2021 11:41:18 -0500
Subject: [PATCH] cambio

---
 index.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/index.html b/index.html
index 72f318e..0b347b3 100644
--- a/index.html
+++ b/index.html
@@ -80,7 +80,7 @@
 <header>
   <h2>Versionamiento de código con GitHub</h2>
 </header>
-<<<<<<< HEAD
+
 <div id="body">
  <section>
   <nav>
@@ -98,11 +98,11 @@ <h1>Contenido</h1>
  </section>
 </div> 
 
-=======
+
 
 <footer>
   <p><a href="https://periferiaitgroup.com/" target="_blank" style="color:cornsilk">Periferia IT Group 2020</a></p>
 </footer> 
->>>>>>> feature/footer
+
 </body>
 </html>