From d0bbd38e8c1d2cd421e0a8ea3dcc1d89390ebefc Mon Sep 17 00:00:00 2001
From: michael_rodriguez <michael_rodriguez@wycliffeassociates.org>
Date: Mon, 25 Apr 2022 12:06:37 -0500
Subject: [PATCH] Mon Apr 25 2022 12:06:36 GMT-0500 (GMT-05:00)

---
 20/01.txt     |   6 +--
 20/06.txt     |   6 +--
 20/12.txt     |   6 +--
 20/title.txt  |   6 +--
 manifest.json | 104 ++++++++++++++++++++++++++------------------------
 5 files changed, 58 insertions(+), 70 deletions(-)

diff --git a/20/01.txt b/20/01.txt
index 8332808..c9df9f8 100644
--- a/20/01.txt
+++ b/20/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 20 \v 1 \v 2 chanchu David taxtulh nak Naiot  xtapekgsit Ramá milh chu wanilh Jonatán
-=======
-\c 20 \v 1 wancho David taxtucha nak Naiot nak Ramá cho milh cho wanilh Jonatán: “¿tunta cho kit tlawalh? ¿tunta kintalakgalhin? ¿tunta kintalakgalhin nak xlakatin mintlat cho  chuna putsama kilatamat? \v 2 Jonatán kgalhtilh David: “amakgat tiyma, nikatnit. Wa kintlat nitu kat tlawalh ni palh wa tuku tlanka cho aktsu, palh nikatkiwanilh. ¿chiwna cho wa kintlat nikimatsegniy uyma? Nichuna kat lalh”.
->>>>>>> 423163a0a26a012da7d22844101f7431cae819e2
+\c 20 \v 1 wancho David taxtucha nak Naiot nak Ramá cho milh cho wanilh Jonatán: “¿tunta cho kit tlawalh? ¿tunta kintalakgalhin? ¿tunta kintalakgalhin nak xlakatin mintlat cho  chuna putsama kilatamat? \v 2 Jonatán kgalhtilh David: “amakgat tiyma, nikatnit. Wa kintlat nitu kat tlawalh ni palh wa tuku tlanka cho aktsu, palh nikatkiwanilh. ¿chiwna cho wa kintlat nikimatsegniy uyma? Nichuna kat lalh”.
\ No newline at end of file
diff --git a/20/06.txt b/20/06.txt
index 9872a75..1a29a4b 100644
--- a/20/06.txt
+++ b/20/06.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 6 \v 7 Palh xla nawan: tlan numa, yakgatsiyanka na tawila mi lakstunni; palpi nasitsi, nakatsi pi xla puwanitnatlawa tu nitlan.
-=======
-\v 6 \v 7 palpi wa mintlat nakilkapastaka, wancho nawaniya: “David kiskinilh litlan ampi nak maxkiy talakaskin na´an nak xkachikin Belen; xpalkata ampi na lipaxuwakan tamastan xla kata katatuku mastay xlitalilakgapasni”.
->>>>>>> 423163a0a26a012da7d22844101f7431cae819e2
+\v 6 palpi wa mintlat nakilkapastaka, wancho nawaniya: “David kiskinilh litlan ampi nak maxkiy talakaskin na´an nak xkachikin Belen; xpalkata \v 7 ampi na lipaxuwakan tamastan xla kata katatuku mastay xlitalilakgapasni”.
\ No newline at end of file
diff --git a/20/12.txt b/20/12.txt
index 3ae1e65..69e4955 100644
--- a/20/12.txt
+++ b/20/12.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 12 \v 13 Chu wanilh Jonatán David: Wa PUCHINA katatawilan chuna  lax talama mi tlat.
-=======
-\v 12 \v 13 palpi wa kintlat tlan limaglhkatsiy tuku nitlan natlawaniyan, wa PUCHINA chuna katlawalh Jonatán cho liwka, palpi ni nakmakatsiniyan cho nakmalkgachayan makgat xpalakata ampi agtsiya napina. Wa PUCHINA katatatagsnin, chuna natla tatatagsli kintlat.
->>>>>>> 423163a0a26a012da7d22844101f7431cae819e2
+\v 12 palpi wa kintlat tlan limaglhkatsiy tuku nitlan natlawaniyan, wa PUCHINA chuna katlawalh Jonatán cho liwka, palpi ni nakmakatsiniyan cho nakmalkgachayan makgat xpalakata ampi agtsiya napina. \v 13 Wa PUCHINA katatatagsnin, chuna natla tatatagsli kintlat.
\ No newline at end of file
diff --git a/20/title.txt b/20/title.txt
index 22ae894..3a34c96 100644
--- a/20/title.txt
+++ b/20/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Capítulo 20
-=======
-Capitulo 20
->>>>>>> 423163a0a26a012da7d22844101f7431cae819e2
+Capítulo 20
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 076783a..be8dc3e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -152,6 +152,50 @@
 		"09-07",
 		"09-09",
 		"09-12",
+		"09-14",
+		"09-15",
+		"09-17",
+		"09-20",
+		"09-22",
+		"09-23",
+		"09-25",
+		"09-27",
+		"10-title",
+		"10-01",
+		"10-03",
+		"10-05",
+		"10-07",
+		"10-09",
+		"10-11",
+		"10-14",
+		"10-17",
+		"10-20",
+		"10-22",
+		"10-24",
+		"10-25",
+		"10-26",
+		"11-title",
+		"11-01",
+		"11-03",
+		"11-04",
+		"11-06",
+		"11-09",
+		"11-11",
+		"11-12",
+		"11-14",
+		"12-title",
+		"12-01",
+		"12-03",
+		"12-04",
+		"12-06",
+		"12-08",
+		"12-10",
+		"12-12",
+		"12-14",
+		"12-16",
+		"12-19",
+		"12-22",
+		"12-24",
 		"14-title",
 		"14-01",
 		"14-02",
@@ -243,8 +287,17 @@
 		"18-27",
 		"18-30",
 		"19-title",
+		"20-title",
+		"20-01",
+		"20-03",
+		"20-04",
+		"20-06",
 		"20-08",
 		"20-10",
+		"20-12",
+		"20-14",
+		"20-17",
+		"20-20",
 		"20-24",
 		"20-26",
 		"20-28",
@@ -318,55 +371,6 @@
 		"31-04",
 		"31-07",
 		"31-09",
-		"31-11",
-		"09-14",
-		"09-15",
-		"09-17",
-		"09-20",
-		"09-22",
-		"09-23",
-		"09-25",
-		"09-27",
-		"10-title",
-		"10-01",
-		"10-03",
-		"10-05",
-		"10-07",
-		"10-09",
-		"10-11",
-		"10-14",
-		"10-17",
-		"10-20",
-		"10-22",
-		"10-24",
-		"10-25",
-		"10-26",
-		"11-title",
-		"11-01",
-		"11-03",
-		"11-04",
-		"11-06",
-		"11-09",
-		"11-11",
-		"11-12",
-		"11-14",
-		"12-title",
-		"12-01",
-		"12-03",
-		"12-04",
-		"12-06",
-		"12-08",
-		"12-10",
-		"12-12",
-		"12-14",
-		"12-16",
-		"12-19",
-		"12-22",
-		"12-24",
-		"20-03",
-		"20-04",
-		"20-14",
-		"20-17",
-		"20-20"
+		"31-11"
 	]
 }
\ No newline at end of file