Fri Apr 19 2024 16:42:16 GMT+0200 (hora de verano de Europa central)

2024-04-19 16:42:16 +02:00 · 2024-04-19 16:42:16 +02:00 · cf6961c7e7
parent 18c24178fb
commit cf6961c7e7
2 changed files with 2 additions and 10 deletions
--- a/01/01.txt
+++ b/01/01.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 1 \v 1 \v 3 paco \v 2 :)
-=======
-\c 1 \v 1 \v 2 \v 3
->>>>>>> f74c55679c0f5aad98efa2c57917f1adaf6b90a0
+\c 1 \v 1 \v 2 \v 3
--- a/01/04.txt
+++ b/01/04.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 4 \v 5 \v 6 \v
-=======
-\v 4 hola  \v 5 hola  com va \v 6 hola
->>>>>>> f74c55679c0f5aad98efa2c57917f1adaf6b90a0
+\v 4 \v 5 \v 6 \v