ajuste cambio js

Mofadon · Aug 26, 2024 · b07b562 · b07b562
1 parent d9f0bcb
commit b07b562
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/script.js b/script.js
@@ -78,10 +78,7 @@ function desencriptarTexto(texto) {
     }, texto);
 }
 
-<<<<<<< HEAD
-=======
 
->>>>>>> origin/master
 // Función para copiar texto al portapapeles
 function copiarTexto() {
     const texto = document.querySelector('.ingtxt1').textContent.trim();