From f8946194a4e36a217098cad6b305aa6918340d06 Mon Sep 17 00:00:00 2001
From: Joseeliezerr123 <joseeliezerr123@gmail.com>
Date: Sat, 2 Mar 2024 12:43:24 -0600
Subject: [PATCH 1/2] =?UTF-8?q?Sat=20Mar=2002=202024=2012:43:23=20GMT-0600?=
 =?UTF-8?q?=20(hora=20est=C3=A1ndar=20central)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 01/01.txt     | 6 +-----
 manifest.json | 5 +++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/01/01.txt b/01/01.txt
index 8cd2e5c..a6ca4bd 100644
--- a/01/01.txt
+++ b/01/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 1 \v 1 Kopieya matakabi Dioso itsi itabojjo yajawa ira. \v 2 Ira itsakuena apojjenae. Itakiri nakua irajawata itasa dajjita. Dioso pe jamatabukuene saya nuka najenaejaeba mera jawata.
-=======
-\c 1 \v 1 Ajenata abajju Dioso itabojjo yajawa ira ejjana. \v 2 Ira itsakuijiru apo jjeinae yajawua ira sajineka. Aitakiritsekae nakua. Dioso pejumapeyo jinaruta menejawajjiya.
->>>>>>> e68c6799ddb5af3fc8e6f98a801be6e30d573516
+\c 1 \v 1 Kopieya matakabi Dioso itsi itabojjo yajawa ira. \v 2 Ira itsakuena apojjenae. Itakiri nakua irajawata itasa dajjita. Dioso pe jamatabukuene saya nuka najenaejaeba mera jawata.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 79450f2..736ca64 100644
--- a/manifest.json
+++ b/manifest.json
@@ -27,7 +27,7 @@
 			"language_id": "es-419",
 			"resource_id": "ulb",
 			"checking_level": "3",
-			"date_modified": "2023-02-22T15:56:51.834381+00:00",
+			"date_modified": "2023-08-14T14:30:22.2223208+00:00",
 			"version": "1.9"
 		}
 	],
@@ -37,7 +37,8 @@
 		"wendyc",
 		"Gabrielsanchez",
 		"wilsonalbaritorodriguez",
-		"Mercedes_Romero"
+		"Mercedes_Romero",
+		"Joseeliezerr123"
 	],
 	"finished_chunks": [
 		"24-title",

From 421fe0b0aeb3aaad9946b1845845d14caed99ca6 Mon Sep 17 00:00:00 2001
From: wendyc <wendy_colon@wycliffeassociates.org>
Date: Sat, 2 Mar 2024 14:41:55 -0400
Subject: [PATCH 2/2] Sat Mar 02 2024 14:41:55 GMT-0400 (hora de Bolivia)

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 736ca64..6894005 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
 	"format": "usfm",
 	"generator": {
 		"name": "ts-desktop",
-		"build": "238"
+		"build": "280"
 	},
 	"target_language": {
 		"id": "guh",