Wed Apr 17 2024 19:37:19 GMT+0200 (hora de verano de Europa central)

2024-04-17 19:37:20 +02:00 · 2024-04-17 19:37:20 +02:00 · 32b434f7de
parent ba42d30374
commit 32b434f7de
2 changed files with 2 additions and 6 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 Noemí Sampedro
->>>>>>> 1bf175ef7febf17baaf754861971e360dd89651f
+\c 1 \v 1 \v 3 paco \v 2 :)
--- a/01/04.txt
+++ b/01/04.txt
@ -1 +1 @@
-\v 4 3kihiuhouojmop. \v 6 \v 5 ikhiuojokjopij.   iuhnoinmomp
+\v 4 \v 5 \v 6 \v