From 1c47c790a764b668c79b40d045ff5de1eb03fca7 Mon Sep 17 00:00:00 2001
From: Joseeliezerr123 <joseeliezerr123@noreply.example.org>
Date: Fri, 5 Apr 2024 06:10:30 -0600
Subject: [PATCH] =?UTF-8?q?Fri=20Apr=2005=202024=2006:10:30=20GMT-0600=20(?=
 =?UTF-8?q?hora=20est=C3=A1ndar=20central)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 06/title.txt | 6 +-----
 38/title.txt | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/06/title.txt b/06/title.txt
index 87cfec4a..f5c1ea56 100644
--- a/06/title.txt
+++ b/06/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Capítulo 6
-=======
-Capitulo 6
->>>>>>> d0c47a11a5978d9ef1156a0cb00f04827c2f04ac
+Capitulo 6
\ No newline at end of file
diff --git a/38/title.txt b/38/title.txt
index 18a3ea94..50fb7507 100644
--- a/38/title.txt
+++ b/38/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Capitulo 38
-=======
-Capítulo 38
->>>>>>> 425ff75c569ca5bca9ace19906b1f84d9e1e4ab7
+Capítulo 38
\ No newline at end of file