From 2a7ef89d6e29f1c89d9701137cb00378a30ed791 Mon Sep 17 00:00:00 2001
From: michael_rodriguez <michael_rodriguez@wycliffeassociates.org>
Date: Tue, 14 Nov 2023 10:14:51 -0400
Subject: [PATCH] Tue Nov 14 2023 10:14:50 GMT-0400 (Atlantic Standard Time)

---
 01/01.txt     |  6 +-----
 06/10.txt     |  6 +-----
 06/20.txt     |  6 +-----
 manifest.json | 24 +++++++++++++-----------
 4 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/01/01.txt b/01/01.txt
index 0bb30bc4..a2c1df06 100644
--- a/01/01.txt
+++ b/01/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 1 \v 1 \v 2 \v 3 Moise tho tarkur ,jose ieba nun ,ewandamua mag jim ,pu rig ta uepeyaipan ajim chi juapa,maimua peta aji mua dur jautar ar.
-=======
-\c 1 \v 1 Moises meetar khurr mʉgtà ajim, chi ihog Ēwandanden, Ēwandamau iekhajim Josueeg Nun iewa, Moises dʉi nʉrraa jeemau, Mug jim: \v 2 "Moises, mʉ chog mee jim mag sim aawei phiidiba, durbaba mug Jordan gaar, pʉ mai mua chi phoboor khʉʉn ar mua jēb deetarr gar Israel pienaag. \v 3 Paanau dʉnʉi bam jēb paan den ajú Pʉrug mʉruu deejim, Moises dee taorjo awai.
->>>>>>> 662b16734253d551c4a76edb6bbea0bc1cd5848c
+\c 1 \v 1 Moises meetar khurr mʉgtà ajim, chi ihog Ēwandanden, Ēwandamau iekhajim Josueeg Nun iewa, Moises dʉi nʉrraa jeemau, Mug jim: \v 2 "Moises, mʉ chog mee jim mag sim aawei phiidiba, durbaba mug Jordan gaar, pʉ mai mua chi phoboor khʉʉn ar mua jēb deetarr gar Israel pienaag. \v 3 Paanau dʉnʉi bam jēb paan den ajú Pʉrug mʉruu deejim, Moises dee taorjo awai.
\ No newline at end of file
diff --git a/06/10.txt b/06/10.txt
index 30310061..e5e93184 100644
--- a/06/10.txt
+++ b/06/10.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 10 Mamu Joseeu phoboor rag jaau jim anum: ''khiuu ereeu phubaad, khaai ab amua paanig theeg oo abat aaweita paan theen oo aagau ajim anum''. \v 11 Magta khaai ab ee Josueeu waujim Ewandam arka phoboor igaau weisiagathee. maimua dug jieeram di eu simee magee khai jieeram anum.
-=======
-\v 10 Mamʉ Joseeu phoboor rag jaau jim anʉm: ''khiʉʉ ereeu phubaad, khaai ãb amua paanig theeg oo abat aaweita paan theen oo aagau ajim anʉm''. \v 11 Magta khaai ab ee Josueeu waujim Ẽwandam arka phoboor igaau weisiagathee. maimua dug jieeram di eu simee magee khai jieeram anʉm.
->>>>>>> f023dd3a94ac41602f04118bc29a1f9f5aa412e5
+\v 10 Mamʉ Joseeu phoboor rag jaau jim anʉm: ''khiʉʉ ereeu phubaad, khaai ãb amua paanig theeg oo abat aaweita paan theen oo aagau ajim anʉm''. \v 11 Magta khaai ab ee Josueeu waujim Ẽwandam arka phoboor igaau weisiagathee. maimua dug jieeram di eu simee magee khai jieeram anʉm.
\ No newline at end of file
diff --git a/06/20.txt b/06/20.txt
index 10a567ff..c2544537 100644
--- a/06/20.txt
+++ b/06/20.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 20 Theeg oo ajieram thunwe chi churo iek unathaawei, mai chi thuursim buurjim mag chi thuursim burbaadei amach dug jieram, amach ã abdu aba dudurag maajieram. Mai amach dʉi juadu ajieeram chi phoboor. \v 21 Thũnwe phoboor ee jooba naarkhuun thookha puijieeram thuthuiyau--enkhoon maimua ʉʉn, chaain jooinnaan, bueyes, ovejas maimua burros.
-=======
-\v 20 Theeg oo ajieram thʉnwe chi churo iek ʉnathaawei, mai chi thuursim bʉrjim mag chi thuursim bʉrbaadei amach dug jieram, amach ã abdʉ aba dʉdurag maajieram. Mai amach dʉi juadu ajieeram chi phobor. \p \v 21 Thʉnwe phoboor ee jooba naarkhuun thookha puijieeram thuthuiyau--enkhoon maimua ʉʉn, chaain jooinnaan, bueyes, ovejas maigmua burros.
->>>>>>> f023dd3a94ac41602f04118bc29a1f9f5aa412e5
+\v 20 Theeg oo ajieram thunwe chi churo iek unathaawei, mai chi thuursim buurjim mag chi thuursim burbaadei amach dug jieram, amach ã abdu aba dudurag maajieram. Mai amach dʉi juadu ajieeram chi phoboor. \v 21 Thũnwe phoboor ee jooba naarkhuun thookha puijieeram thuthuiyau--enkhoon maimua ʉʉn, chaain jooinnaan, bueyes, ovejas maimua burros.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index bc5be3d5..9ea3ed5e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -47,6 +47,11 @@
 	"finished_chunks": [
 		"front-title",
 		"01-title",
+		"01-01",
+		"01-04",
+		"01-12",
+		"01-14",
+		"01-16",
 		"02-title",
 		"02-01",
 		"02-04",
@@ -70,12 +75,15 @@
 		"03-14",
 		"03-17",
 		"04-title",
+		"04-08",
 		"04-10",
+		"04-12",
 		"04-15",
 		"04-17",
 		"04-19",
 		"04-22",
 		"05-title",
+		"05-08",
 		"06-title",
 		"06-15",
 		"06-17",
@@ -90,6 +98,10 @@
 		"08-15",
 		"08-18",
 		"08-20",
+		"08-24",
+		"08-27",
+		"08-29",
+		"08-34",
 		"09-title",
 		"09-01",
 		"09-03",
@@ -117,16 +129,6 @@
 		"21-title",
 		"22-title",
 		"23-title",
-		"24-title",
-		"08-24",
-		"08-27",
-		"08-29",
-		"08-34",
-		"05-08",
-		"04-08",
-		"04-12",
-		"01-12",
-		"01-14",
-		"01-16"
+		"24-title"
 	]
 }
\ No newline at end of file