Resuelve el conflicto y mergea feature a master

2024-01-09 10:39:35 -03:00 · 2024-01-09 10:39:35 -03:00 · c563de9167
commit c563de9167
parent 8f83dbce46 86010292a4
1 changed files with 1 additions and 1 deletions
--- a/index.html
+++ b/index.html
@ -6,6 +6,6 @@
    <title>Document</title>
 </head>
 <body>
-    Cambio B
+    Cambio ya mergeado.
 </body>
 </html>