From 84b7a7e15be5bdd19944494062630eff7a8da060 Mon Sep 17 00:00:00 2001
From: dayaksalako <dayaksalako@noreply.door43.org>
Date: Fri, 25 Sep 2020 17:27:20 +0700
Subject: [PATCH] Fri Sep 25 2020 17:27:19 GMT+0700 (SE Asia Standard Time)

---
 04/title.txt  |  6 +---
 07/01.txt     |  8 ++---
 manifest.json | 89 ++++++++++++++++++++++++++-------------------------
 3 files changed, 48 insertions(+), 55 deletions(-)

diff --git a/04/title.txt b/04/title.txt
index 65a8af68..dc7a32d2 100644
--- a/04/title.txt
+++ b/04/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Pasal 4
-=======
-Pasal  4
->>>>>>> cdb8e60d2d1df4681ccdfce488aca34ba1208d61
+Pasal 4
\ No newline at end of file
diff --git a/07/01.txt b/07/01.txt
index 3c5019dc..87909fc1 100644
--- a/07/01.txt
+++ b/07/01.txt
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
-PEMBELAAN STEFANUS
-\v 1  Lalu, Imam Kayo' bakato, "Batol ge jaiyo ?" \v 2  Stefanus bakato, "Kamaru-kamaru ba bapo'-bapo', dangarot aku.  Allah nang Mahamulia gari ka nenek moyang diri, Abraham, waktu io masih diop ka Mesopotamia, sanape io diop ka Haran,\v 3 lalu bakato ka io, dari kau ampat kasio tingoot kamaru-kamarungu, atok ka tanoh nang Ku nojokot ka kau".
-=======
-\v 1 \v 2 \v 3 SAULUSPUN
->>>>>>> 35300ec40436752f363a7f13354f84507ca22bb2
+\c 7 PEMBELAAN STEFANUS
+ \v 1  Lalu, Imam Kayo' bakato, "Batol ge jaiyo ?" \v 2  Stefanus bakato, "Kamaru-kamaru ba bapo'-bapo', dangarot aku.  Allah nang Mahamulia gari ka nenek moyang diri, Abraham, waktu io masih diop ka Mesopotamia, sanape io diop ka Haran, \v 3 lalu bakato ka io, dari kau ampat kasio tingoot kamaru-kamarungu, atok ka tanoh nang Ku nojokot ka kau".
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 5c67b805..f8dc9e01 100644
--- a/manifest.json
+++ b/manifest.json
@@ -46,12 +46,16 @@
 		"Yohanes"
 	],
 	"finished_chunks": [
+		"front-title",
 		"01-title",
+		"01-01",
+		"01-04",
 		"01-06",
 		"01-09",
 		"01-12",
 		"01-15",
 		"01-17",
+		"01-20",
 		"01-21",
 		"01-24",
 		"02-title",
@@ -85,6 +89,7 @@
 		"03-19",
 		"03-21",
 		"03-24",
+		"04-title",
 		"04-01",
 		"04-05",
 		"04-08",
@@ -92,6 +97,14 @@
 		"04-13",
 		"04-15",
 		"04-19",
+		"04-21",
+		"04-23",
+		"04-26",
+		"04-27",
+		"04-29",
+		"04-32",
+		"04-34",
+		"04-36",
 		"05-title",
 		"05-01",
 		"05-03",
@@ -106,6 +119,17 @@
 		"05-26",
 		"05-29",
 		"05-33",
+		"05-35",
+		"05-38",
+		"05-40",
+		"06-title",
+		"06-01",
+		"06-02",
+		"06-05",
+		"06-07",
+		"06-08",
+		"06-10",
+		"06-12",
 		"07-title",
 		"07-01",
 		"07-04",
@@ -122,6 +146,14 @@
 		"07-33",
 		"07-35",
 		"07-38",
+		"07-41",
+		"07-43",
+		"07-44",
+		"07-47",
+		"07-51",
+		"07-54",
+		"07-57",
+		"07-59",
 		"08-title",
 		"08-01",
 		"08-04",
@@ -151,35 +183,6 @@
 		"09-23",
 		"09-26",
 		"09-28",
-		"01-01",
-		"01-04",
-		"04-21",
-		"04-23",
-		"04-26",
-		"04-27",
-		"04-29",
-		"04-32",
-		"04-34",
-		"04-36",
-		"05-35",
-		"05-38",
-		"05-40",
-		"06-title",
-		"06-01",
-		"06-02",
-		"06-05",
-		"06-07",
-		"06-08",
-		"06-10",
-		"06-12",
-		"07-41",
-		"07-43",
-		"07-44",
-		"07-47",
-		"07-51",
-		"07-54",
-		"07-57",
-		"07-59",
 		"09-31",
 		"09-33",
 		"09-36",
@@ -369,6 +372,18 @@
 		"22-27",
 		"22-30",
 		"23-title",
+		"23-09",
+		"23-11",
+		"23-12",
+		"23-14",
+		"23-16",
+		"23-18",
+		"23-20",
+		"23-22",
+		"23-25",
+		"23-28",
+		"23-31",
+		"23-34",
 		"24-title",
 		"24-01",
 		"24-04",
@@ -434,20 +449,6 @@
 		"28-25",
 		"28-27",
 		"28-28",
-		"28-30",
-		"01-20",
-		"front-title",
-		"23-09",
-		"23-11",
-		"23-12",
-		"23-14",
-		"23-16",
-		"23-18",
-		"23-20",
-		"23-22",
-		"23-25",
-		"23-28",
-		"23-31",
-		"23-34"
+		"28-30"
 	]
 }
\ No newline at end of file