From fb776a843b55be19d5e700d5384cc4b64beac9b4 Mon Sep 17 00:00:00 2001
From: tsDesktop <you@example.com>
Date: Tue, 10 Mar 2020 11:12:41 +0300
Subject: [PATCH] Tue Mar 10 2020 11:12:40 GMT+0300 (E. Africa Standard Time)

---
 01/title.txt    |   6 +--
 front/title.txt |   2 +-
 manifest.json   | 120 ++++++++++++++++++++++++------------------------
 3 files changed, 63 insertions(+), 65 deletions(-)

diff --git a/01/title.txt b/01/title.txt
index 8ea4c34..86739ed 100644
--- a/01/title.txt
+++ b/01/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Efesiana Toko 1
-=======
-Efesiana Toko faha1
->>>>>>> d08abf19cd32c1168fb45c6cebf98d5c8ec500d6
+Toko 1
\ No newline at end of file
diff --git a/front/title.txt b/front/title.txt
index 465a6b2..6e6331b 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1 +1 @@
-EFESIANA
\ No newline at end of file
+Efesiana
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index fc0ea3f..e9a5390 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,17 +1,10 @@
 {
-	"project": {
-		"id": "eph",
-		"name": ""
-	},
-	"type": {
-		"id": "text",
-		"name": "Text"
-	},
+	"package_version": 7,
+	"format": "usfm",
 	"generator": {
 		"name": "ts-desktop",
 		"build": "3"
 	},
-	"package_version": 7,
 	"target_language": {
 		"name": "Antambahoaka",
 		"direction": "ltr",
@@ -20,68 +13,34 @@
 		"is_gateway_language": false,
 		"id": "-x-antambahoaka"
 	},
-	"format": "usfm",
+	"project": {
+		"id": "eph",
+		"name": "Ephesians"
+	},
+	"type": {
+		"id": "text",
+		"name": "Text"
+	},
 	"resource": {
 		"id": "reg"
 	},
-	"translators": [
-		"PLT-MADA007",
-		"PLT-MAD006"
-	],
 	"source_translations": [
 		{
 			"language_id": "plt",
 			"resource_id": "ulb",
 			"checking_level": "3",
-			"date_modified": 20181101,
+			"date_modified": "2018-11-01T00:00:00+00:00",
 			"version": "7.1"
 		}
 	],
+	"translators": [
+		"PLT-MADA007",
+		"PLT-MAD006",
+		"Dell"
+	],
 	"finished_chunks": [
-		"03-title",
 		"front-title",
-		"04-title",
-		"04-04",
-		"04-07",
-		"04-09",
-		"04-11",
-		"04-14",
-		"04-28",
-		"04-31",
-		"04-25",
-		"04-23",
-		"04-20",
-		"04-01",
-		"04-17",
-		"03-01",
-		"03-03",
-		"03-06",
-		"03-08",
-		"03-10",
-		"03-12",
-		"03-14",
-		"03-17",
-		"03-20",
-		"06-title",
-		"06-01",
-		"06-04",
-		"06-05",
-		"06-09",
-		"06-10",
-		"06-23",
-		"06-21",
-		"06-19",
-		"06-17",
-		"06-12",
-		"06-14",
-		"02-01",
-		"02-04",
-		"02-08",
-		"02-11",
-		"02-13",
-		"02-17",
-		"02-19",
-		"02-title",
+		"01-title",
 		"01-01",
 		"01-03",
 		"01-05",
@@ -93,6 +52,37 @@
 		"01-17",
 		"01-19",
 		"01-22",
+		"02-title",
+		"02-01",
+		"02-04",
+		"02-08",
+		"02-11",
+		"02-13",
+		"02-17",
+		"02-19",
+		"03-title",
+		"03-01",
+		"03-03",
+		"03-06",
+		"03-08",
+		"03-10",
+		"03-12",
+		"03-14",
+		"03-17",
+		"03-20",
+		"04-title",
+		"04-01",
+		"04-04",
+		"04-07",
+		"04-09",
+		"04-11",
+		"04-14",
+		"04-17",
+		"04-20",
+		"04-23",
+		"04-25",
+		"04-28",
+		"04-31",
 		"05-01",
 		"05-03",
 		"05-05",
@@ -103,6 +93,18 @@
 		"05-22",
 		"05-25",
 		"05-28",
-		"05-31"
+		"05-31",
+		"06-title",
+		"06-01",
+		"06-04",
+		"06-05",
+		"06-09",
+		"06-10",
+		"06-12",
+		"06-14",
+		"06-17",
+		"06-19",
+		"06-21",
+		"06-23"
 	]
 }
\ No newline at end of file