Wed Apr 17 2024 12:28:58 GMT+0200 (hora de verano de Europa central)

2024-04-17 12:28:59 +02:00 · 2024-04-17 12:28:59 +02:00 · bf1f88a0b9
parent 19df7f0ca1
commit bf1f88a0b9
2 changed files with 1 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
->>>>>>> 5952c5f49ecda2692590865043006c94ecb4c97a
+\c 1 \v 1 \v 2 \v 3
--- a/01/04.txt
+++ b/01/04.txt
@ -1,5 +0,0 @@
-<<<<<<< HEAD
-\v 4 3kihiuhouojmop. \v 6 \v 5 ikhiuojokjopij.   iuhnoinmomp
-=======
-\v 4 hola  \v 5 hola  com va \v 6 hola
->>>>>>> 5952c5f49ecda2692590865043006c94ecb4c97a