From bac507376a0de434af53e551efe3ce7aa413e28c Mon Sep 17 00:00:00 2001
From: tsDesktop <you@example.com>
Date: Sun, 18 Nov 2018 21:59:02 +1000
Subject: [PATCH] Sun Nov 18 2018 21:59:02 GMT+1000 (West Pacific Standard
 Time)

---
 front/title.txt |  6 +----
 manifest.json   | 71 ++++++++++++++++++++++++++-----------------------
 2 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/front/title.txt b/front/title.txt
index 862227b..78fb14c 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Korosieni
-=======
-Korosi-en
->>>>>>> fd470173941651a44ed72833976a0ed39cb6829e
+Korosieni
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 8e13101..71f436b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,17 +1,10 @@
 {
-	"project": {
-		"id": "col",
-		"name": ""
-	},
-	"type": {
-		"id": "text",
-		"name": "Text"
-	},
+	"package_version": 7,
+	"format": "usfm",
 	"generator": {
 		"name": "ts-desktop",
 		"build": "132"
 	},
-	"package_version": 7,
 	"target_language": {
 		"name": "Usarufa",
 		"direction": "ltr",
@@ -20,14 +13,17 @@
 		"is_gateway_language": false,
 		"id": "usa"
 	},
-	"format": "usfm",
+	"project": {
+		"id": "col",
+		"name": "Colossians"
+	},
+	"type": {
+		"id": "text",
+		"name": "Text"
+	},
 	"resource": {
 		"id": "reg"
 	},
-	"translators": [
-		"Taiven",
-		"Ray"
-	],
 	"source_translations": [
 		{
 			"language_id": "en",
@@ -37,8 +33,34 @@
 			"version": "9"
 		}
 	],
+	"translators": [
+		"Taiven",
+		"Ray",
+		"jonathan"
+	],
 	"finished_chunks": [
+		"front-title",
+		"01-title",
+		"01-15",
+		"01-24",
+		"01-28",
+		"02-title",
+		"02-01",
+		"02-04",
+		"02-06",
+		"02-08",
+		"02-10",
+		"02-13",
+		"02-16",
+		"02-18",
+		"02-20",
+		"03-title",
+		"03-01",
+		"03-05",
+		"03-09",
+		"03-12",
 		"03-15",
+		"03-18",
 		"03-22",
 		"04-title",
 		"04-01",
@@ -48,25 +70,6 @@
 		"04-10",
 		"04-12",
 		"04-15",
-		"04-18",
-		"03-18",
-		"03-12",
-		"03-09",
-		"03-05",
-		"03-01",
-		"02-title",
-		"02-04",
-		"02-01",
-		"02-06",
-		"02-08",
-		"02-10",
-		"02-13",
-		"02-16",
-		"02-18",
-		"02-20",
-		"01-15",
-		"01-24",
-		"01-28",
-		"01-title"
+		"04-18"
 	]
 }
\ No newline at end of file