From 1870aeb97797ed8417229777de0c93a7bf51182c Mon Sep 17 00:00:00 2001
From: tsDesktop <you@example.com>
Date: Sun, 17 Nov 2019 18:14:15 -0800
Subject: [PATCH] Sun Nov 17 2019 18:14:14 GMT-0800 (Pacific Standard Time)

---
 04/title.txt  |   6 +--
 manifest.json | 124 +++++++++++++++++++++++++-------------------------
 2 files changed, 64 insertions(+), 66 deletions(-)

diff --git a/04/title.txt b/04/title.txt
index 5c68368..db388dc 100644
--- a/04/title.txt
+++ b/04/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Marka Toko faha 4
-=======
-toko faha 4
->>>>>>> 0433c4763a32de76241349c802c420f4036eb1ad
+Toko faha 4
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 5038a58..c7f7dd5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -34,7 +34,8 @@
 	"parent_draft": {},
 	"translators": [
 		"LAPTOP-HA9V2PJ1",
-		"MAD100"
+		"MAD100",
+		"DELL"
 	],
 	"finished_chunks": [
 		"01-title",
@@ -85,6 +86,23 @@
 		"03-28",
 		"03-31",
 		"03-33",
+		"04-title",
+		"04-01",
+		"04-03",
+		"04-06",
+		"04-08",
+		"04-10",
+		"04-13",
+		"04-16",
+		"04-18",
+		"04-21",
+		"04-24",
+		"04-26",
+		"04-30",
+		"04-33",
+		"04-35",
+		"04-38",
+		"04-40",
 		"05-title",
 		"05-01",
 		"05-03",
@@ -232,6 +250,49 @@
 		"12-38",
 		"12-41",
 		"12-43",
+		"13-title",
+		"13-01",
+		"13-03",
+		"13-05",
+		"13-07",
+		"13-09",
+		"13-11",
+		"13-14",
+		"13-17",
+		"13-21",
+		"13-24",
+		"13-28",
+		"13-30",
+		"13-33",
+		"13-35",
+		"14-title",
+		"14-01",
+		"14-03",
+		"14-06",
+		"14-10",
+		"14-12",
+		"14-15",
+		"14-17",
+		"14-20",
+		"14-22",
+		"14-26",
+		"14-28",
+		"14-30",
+		"14-32",
+		"14-35",
+		"14-37",
+		"14-40",
+		"14-43",
+		"14-47",
+		"14-51",
+		"14-53",
+		"14-55",
+		"14-57",
+		"14-60",
+		"14-63",
+		"14-66",
+		"14-69",
+		"14-71",
 		"15-title",
 		"15-01",
 		"15-04",
@@ -258,65 +319,6 @@
 		"16-09",
 		"16-14",
 		"16-17",
-		"16-19",
-		"04-16",
-		"04-21",
-		"04-24",
-		"04-01",
-		"04-03",
-		"04-06",
-		"04-08",
-		"04-10",
-		"04-13",
-		"04-18",
-		"04-26",
-		"04-30",
-		"04-33",
-		"04-35",
-		"04-38",
-		"04-40",
-		"13-01",
-		"13-07",
-		"13-09",
-		"13-11",
-		"13-14",
-		"13-21",
-		"13-24",
-		"13-28",
-		"13-30",
-		"13-33",
-		"14-01",
-		"14-03",
-		"13-35",
-		"13-17",
-		"13-title",
-		"14-10",
-		"14-17",
-		"14-22",
-		"14-15",
-		"14-26",
-		"14-30",
-		"14-32",
-		"14-35",
-		"14-37",
-		"14-40",
-		"14-43",
-		"14-47",
-		"14-51",
-		"14-53",
-		"14-55",
-		"14-57",
-		"14-63",
-		"14-06",
-		"14-12",
-		"14-20",
-		"14-28",
-		"14-60",
-		"14-title",
-		"13-03",
-		"13-05",
-		"14-66",
-		"14-69",
-		"14-71"
+		"16-19"
 	]
 }
\ No newline at end of file