From 101abee67fbf1e9086e0d68430efd1104ed1bca4 Mon Sep 17 00:00:00 2001
From: Jaime <jaime@amor.world>
Date: Thu, 14 Apr 2022 20:16:28 +0200
Subject: [PATCH] Thu Apr 14 2022 20:16:28 GMT+0200 (hora de verano de Europa
 central)

---
 front/title.txt | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/front/title.txt b/front/title.txt
index e08d900..a3570fa 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-O Apocalipse
-=======
-Apocalipse
->>>>>>> bf78d0d2272954fc58fa871e929b4239c298c4e7
+O Apocalipse
\ No newline at end of file