From ed29583ca2029e4e12e042048ba7e175030aec05 Mon Sep 17 00:00:00 2001
From: michael_rodriguez <michael_rodriguez@wycliffeassociates.org>
Date: Wed, 4 Aug 2021 09:28:01 -0400
Subject: [PATCH] Wed Aug 04 2021 09:28:01 GMT-0400 (Eastern Daylight Time)

---
 01/title.txt  |  6 +---
 06/07.txt     |  6 +---
 manifest.json | 97 ++++++++++++++++++++++++++-------------------------
 3 files changed, 52 insertions(+), 57 deletions(-)

diff --git a/01/title.txt b/01/title.txt
index 88bb2b5..c6d56d7 100644
--- a/01/title.txt
+++ b/01/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Ndá 1
-=======
-Nda' 1
->>>>>>> 4cbf96073b764fc09da45ffd6f2666b4066e86d0
+Nda' 1
\ No newline at end of file
diff --git a/06/07.txt b/06/07.txt
index 0186d09..75b39ed 100644
--- a/06/07.txt
+++ b/06/07.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 7 Ne ora dendxu huini que bixhale ra idapa sellu que la? binadiaga idapa bultu que ne ná: "¡Gudá!" \v 8 Ne ora que biyaa ti mani guchi'. Ne ni dxiba lame que bire' la Guenda' guti, ne Hades zinanda la. Ne bidii cabe la tobi de ca tapa nda' xti guidxilayú, para guti ne espada, gubiña ne guenda huará, ne mani dúxu' xti guidxilayú.
-=======
-\v 7 \v 8 Ne ora dendxu huini que bixale
->>>>>>> 9f41341b7a68e21e2829bf1955a6d56553a2db72
+\v 7 Ne ora dendxu huini que bixhale ra idapa sellu que la? binadiaga idapa bultu que ne ná: "¡Gudá!" \v 8 Ne ora que biyaa ti mani guchi'. Ne ni dxiba lame que bire' la Guenda' guti, ne Hades zinanda la. Ne bidii cabe la tobi de ca tapa nda' xti guidxilayú, para guti ne espada, gubiña ne guenda huará, ne mani dúxu' xti guidxilayú.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 4a1d397..e3ff8a8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -44,6 +44,7 @@
 	],
 	"finished_chunks": [
 		"front-title",
+		"01-title",
 		"01-01",
 		"01-04",
 		"01-07",
@@ -56,6 +57,9 @@
 		"02-01",
 		"02-03",
 		"02-06",
+		"02-08",
+		"02-10",
+		"02-12",
 		"02-14",
 		"02-16",
 		"02-18",
@@ -92,6 +96,36 @@
 		"06-01",
 		"06-03",
 		"06-05",
+		"06-07",
+		"06-09",
+		"06-12",
+		"06-15",
+		"08-01",
+		"08-03",
+		"08-06",
+		"08-08",
+		"08-10",
+		"08-12",
+		"09-01",
+		"09-03",
+		"09-05",
+		"10-title",
+		"10-01",
+		"10-03",
+		"10-05",
+		"10-08",
+		"10-10",
+		"11-title",
+		"11-01",
+		"11-03",
+		"11-06",
+		"11-08",
+		"11-10",
+		"11-13",
+		"11-15",
+		"11-16",
+		"11-18",
+		"11-19",
 		"12-title",
 		"12-01",
 		"12-03",
@@ -110,6 +144,7 @@
 		"13-11",
 		"13-13",
 		"13-15",
+		"13-18",
 		"14-title",
 		"14-01",
 		"14-03",
@@ -149,56 +184,16 @@
 		"17-15",
 		"17-16",
 		"17-18",
-		"20-01",
-		"20-04",
-		"20-05",
-		"20-07",
-		"20-09",
-		"20-11",
-		"20-13",
-		"02-08",
-		"02-10",
-		"02-12",
-		"06-15",
-		"08-01",
-		"08-03",
-		"08-06",
-		"08-08",
-		"08-10",
-		"08-12",
-		"09-01",
-		"09-03",
-		"09-05",
-		"10-title",
-		"11-title",
-		"10-01",
-		"10-08",
-		"10-10",
-		"11-01",
-		"11-06",
-		"11-13",
-		"11-15",
-		"11-16",
-		"11-18",
-		"11-19",
-		"10-03",
-		"10-05",
-		"11-08",
-		"11-10",
-		"11-03",
-		"01-title",
-		"13-18",
-		"18-14",
-		"18-15",
-		"18-21",
-		"18-09",
 		"18-01",
 		"18-04",
 		"18-07",
+		"18-09",
 		"18-11",
+		"18-14",
+		"18-15",
 		"18-18",
+		"18-21",
 		"18-23",
-		"19-21",
 		"19-01",
 		"19-03",
 		"19-05",
@@ -208,6 +203,14 @@
 		"19-11",
 		"19-14",
 		"19-17",
+		"19-21",
+		"20-01",
+		"20-04",
+		"20-05",
+		"20-07",
+		"20-09",
+		"20-11",
+		"20-13",
 		"21-01",
 		"21-03",
 		"21-05",
@@ -218,17 +221,17 @@
 		"21-16",
 		"21-18",
 		"21-21",
-		"21-26",
 		"21-23",
-		"22-12",
+		"21-26",
 		"22-01",
 		"22-03",
 		"22-06",
 		"22-08",
 		"22-10",
+		"22-12",
 		"22-16",
-		"22-18",
 		"22-17",
+		"22-18",
 		"22-20"
 	]
 }
\ No newline at end of file