From ed7096e0de9b781b74cd663e14dde7ae457f11d4 Mon Sep 17 00:00:00 2001
From: tsDesktop <you@example.com>
Date: Wed, 11 Sep 2019 13:28:02 +1000
Subject: [PATCH] Wed Sep 11 2019 13:28:02 GMT+1000 (AUS Eastern Standard Time)

---
 front/title.txt |  6 +----
 manifest.json   | 62 +++++++++++++++++++++++++------------------------
 2 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/front/title.txt b/front/title.txt
index 0e2cd6e..0f300de 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-1 Tesalonika
-=======
-1 TESANONIKA
->>>>>>> 0714a322d157064fe90766956abd7eb4dd264bbe
+1 Tesalonika
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index af38ea0..1b65732 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,17 +1,10 @@
 {
-	"project": {
-		"id": "1th",
-		"name": ""
-	},
-	"type": {
-		"id": "text",
-		"name": "Text"
-	},
+	"package_version": 7,
+	"format": "usfm",
 	"generator": {
 		"name": "ts-desktop",
 		"build": "132"
 	},
-	"package_version": 7,
 	"target_language": {
 		"name": "Melaripi",
 		"direction": "ltr",
@@ -20,14 +13,17 @@
 		"is_gateway_language": false,
 		"id": "tqo-x-melaripi"
 	},
-	"format": "usfm",
+	"project": {
+		"id": "1th",
+		"name": "1 Thessalonians"
+	},
+	"type": {
+		"id": "text",
+		"name": "Text"
+	},
 	"resource": {
 		"id": "reg"
 	},
-	"translators": [
-		"tai elly",
-		"KAKE  EAE"
-	],
 	"source_translations": [
 		{
 			"language_id": "en",
@@ -37,35 +33,41 @@
 			"version": "9"
 		}
 	],
+	"translators": [
+		"tai elly",
+		"KAKE  EAE",
+		"Samuel"
+	],
 	"finished_chunks": [
+		"front-title",
+		"01-title",
+		"01-01",
+		"01-02",
+		"01-04",
+		"01-06",
+		"01-08",
 		"02-title",
+		"02-01",
 		"02-03",
 		"02-05",
 		"02-07",
 		"02-10",
 		"02-13",
-		"04-title",
-		"04-13",
-		"04-16",
-		"02-01",
 		"02-14",
 		"02-17",
+		"03-title",
+		"03-01",
+		"03-04",
+		"03-06",
+		"03-08",
+		"03-11",
+		"04-title",
 		"04-01",
 		"04-03",
 		"04-07",
 		"04-09",
-		"01-title",
-		"03-title",
-		"03-04",
-		"03-01",
-		"01-08",
-		"01-06",
-		"01-04",
-		"01-02",
-		"01-01",
-		"03-06",
-		"03-08",
-		"03-11",
+		"04-13",
+		"04-16",
 		"05-title",
 		"05-01",
 		"05-04",