Fix the wrong rebase

CodiumTeam · Nov 27, 2024 · 6674131 · 6674131
1 parent e4b11fd
commit 6674131
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/src/pages-content/development/methodology.ejs b/src/pages-content/development/methodology.ejs
@@ -19,13 +19,6 @@
           <li class="text-dark-grey">
               <t>Porque te ayudaremos a simplificar e invertir en lo que más importa</t>
           </li>
-<<<<<<< HEAD
-          <li class="text-dark-grey">
-            Porque desarrollamos software flexible a cambios
-          </li>
-           <li class="text-dark-grey">
-            Porque te entregamos valor continuamente
-=======
            <li class="text-dark-grey">
                <t>Porque desarrollamos software flexible a cambios</t>
           </li>
@@ -34,7 +27,6 @@
           </li>
            <li class="text-dark-grey">
                <t>Porque te entregamos valor continuamente</t>
->>>>>>> 89dfa03 (Translate development)
           </li>
         </ul>
       </div>