From 8443a8a7f0a4926e3c15ad459344609fc970c0b0 Mon Sep 17 00:00:00 2001
From: tsDesktop <you@example.com>
Date: Mon, 29 Mar 2021 18:11:53 -0600
Subject: [PATCH] Mon Mar 29 2021 18:11:52 GMT-0600 (Central Standard Time
 (Mexico))

---
 04/01.txt | 6 +-----
 04/03.txt | 6 +-----
 04/05.txt | 6 +-----
 04/08.txt | 6 +-----
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/04/01.txt b/04/01.txt
index 1d5d6000..f117139d 100644
--- a/04/01.txt
+++ b/04/01.txt
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
-\c 4 \v 1 \v 2 Oraque Jesus, Dxa tipa de Espiritu Santu, bigueta de ra guiigu Jordán ne llené Espiritu Santu laa lú desiertu ra chupa lategande dxi, biquiinde binidxaba laabe. Laabe que ñó be ca dxi que' ne ra biluxhe ca dxi que laabe canda'na be.
-=======
 \c 4 \v 1 De raca' Jesus, cumu ma cah tipa ladxido'be de Espiritu
-Santu, biguetabe de guigú Jordán, ne Espiritu que gueneni laabe lú desierto. \v 2 Lu ra chupa late gande dxi guyú binidxa'a nusaba laabe. Que ño dibe gaxti ca dxi di ne ra ma chi guiluxeni laabe ma bindanabe.
->>>>>>> e9538bb544b95d40329500f0a0a51affd7759434
+Santu, biguetabe de guigú Jordán, ne Espiritu que gueneni laabe lú desierto. \v 2 Lu ra chupa late gande dxi guyú binidxa'a nusaba laabe. Que ño dibe gaxti ca dxi di ne ra ma chi guiluxeni laabe ma bindanabe.
\ No newline at end of file
diff --git a/04/03.txt b/04/03.txt
index a9bcd3f6..6cf3adb5 100644
--- a/04/03.txt
+++ b/04/03.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 3 \v 4 Binidxaba rabi laabe: "Pa xhiiñi Diuxi lii, gudxi ca guie' di gaca ca gueta xtia'." Jesus bicabi laabe: "ca lu guichi: 'cadi de gueta xtia' si sabani binni'."
-=======
-\v 3 Ne gudxi binidxaba laabe: "pa dxandi linga xiiñi Diuxi, bisenda' ca guie'ca gacacani pan." \v 4 Jesus bicabi laabe: "ca lu xgui'chi' Diuxi biini codi de ni go' si nga guibani."
->>>>>>> e9538bb544b95d40329500f0a0a51affd7759434
+\v 3 Ne gudxi binidxaba laabe: "pa dxandi linga xiiñi Diuxi, bisenda' ca guie'ca gacacani pan." \v 4 Jesus bicabi laabe: "ca lu xgui'chi' Diuxi biini codi de ni go' si nga guibani."
\ No newline at end of file
diff --git a/04/05.txt b/04/05.txt
index 2c142d2e..90665ca9 100644
--- a/04/05.txt
+++ b/04/05.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 5 \v 6 \v 7 Oraque' binidxaba zine' Jesus ti ra nasoo ne bilui' laabe guira ca guixhi raca mandar xti guidxilayu' nin que ninda'. Binidxaba rabi laabe: "  Naa sudie' lii ca guenda runi mandar di, ne guira guenda ruzani xti ni', ti purti ma bidii ca be ni naa, ne naa zanda gudie' ni tu gacaladxe. Nga runi, pa guzuxhibi lu ne gusisaca lu naa, zaca ni xti lu.
-=======
-\v 5 Deraca' binidxaba yené laabe ra ti nasoo ne bilui' laabe de guira ca guidxi xti guidxilayú que ora que ca'. \v 6 Gudxi binidxaba laabe xti biieque: "Naa Sudie' lii gacalu xaíque xti ndi, ne de guira ni napani ti ma bidi' cabe ni naa, ne naa sanda gudieni ne ni naa gacaladxé. \v 7 Ngue runi, paa lii gusuxibilú ne gusisaca lu naa, sacacani xtilu."
->>>>>>> e9538bb544b95d40329500f0a0a51affd7759434
+\v 5 Deraca' binidxaba yené laabe ra ti nasoo ne bilui' laabe de guira ca guidxi xti guidxilayú que ora que ca'. \v 6 Gudxi binidxaba laabe xti biieque: "Naa Sudie' lii gacalu xaíque xti ndi, ne de guira ni napani ti ma bidi' cabe ni naa, ne naa sanda gudieni ne ni naa gacaladxé. \v 7 Ngue runi, paa lii gusuxibilú ne gusisaca lu naa, sacacani xtilu."
\ No newline at end of file
diff --git a/04/08.txt b/04/08.txt
index 686fba8d..be252007 100644
--- a/04/08.txt
+++ b/04/08.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 8 Peru Jesus bicabi laabe ne rabi laabe: " Ca' lu guiichi: ' Lii suzisaca lu Diuxhi xti lu, ne laa si be guni lu xhiiña'."
-=======
-\v 8 Pero Jesus bacabi ne gudxi laabe: "ca lu xgui'chi' Diuxi:  "Susisacalu diuxi xaíque xti lú, ne sunilu dxiiña xti sibe."
->>>>>>> e9538bb544b95d40329500f0a0a51affd7759434
+\v 8 Pero Jesus bacabi ne gudxi laabe: "ca lu xgui'chi' Diuxi:  "Susisacalu diuxi xaíque xti lú, ne sunilu dxiiña xti sibe."
\ No newline at end of file