From 86046036396033d1ba38c0674494044ee15a2293 Mon Sep 17 00:00:00 2001
From: monchotech <you@example.com>
Date: Thu, 22 Oct 2020 09:20:45 -0400
Subject: [PATCH] Thu Oct 22 2020 09:20:45 GMT-0400 (SA Western Standard Time)

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

diff --git a/13/title.txt b/13/title.txt
index 8c7e937..8b419d4 100644
--- a/13/title.txt
+++ b/13/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Capítulo 13
-=======
-Capitulo 13
->>>>>>> 198d60c9ec32a174206277131b472593d7b6208d
+Capítulo 13
\ No newline at end of file