From 1f4628a2d0b187a0909418941bfe4cfea1276c67 Mon Sep 17 00:00:00 2001
From: noemi_sampedro <noemi_sampedro@noreply.example.org>
Date: Wed, 17 Apr 2024 16:18:48 +0200
Subject: [PATCH] Wed Apr 17 2024 16:18:47 GMT+0200 (hora de verano de Europa
 central)

---
 01/01.txt | 6 +-----
 01/04.txt | 1 -
 2 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 01/04.txt

diff --git a/01/01.txt b/01/01.txt
index 3b1c452..0f783a6 100644
--- a/01/01.txt
+++ b/01/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 1 \v 1 \v 2 \v 3 Noemí Sampedro
-=======
-\c 1 \v 1 \v 2 \v 3
->>>>>>> a1816138c282404b1e8909d7edf0514dbf3e8c2d
+\c 1 \v 1 \v 2 \v 3
\ No newline at end of file
diff --git a/01/04.txt b/01/04.txt
deleted file mode 100644
index c3086a8..0000000
--- a/01/04.txt
+++ /dev/null
@@ -1 +0,0 @@
-\v 4 hola  \v 5 hola  com va \v 6 hola
\ No newline at end of file