From 943080d952ad2f7c2a6bbdc761c474925d8cfbb8 Mon Sep 17 00:00:00 2001
From: Pungs6TH16 <you@example.com>
Date: Wed, 6 Jul 2016 09:46:42 +0100
Subject: [PATCH] Wed Jul 06 2016 09:46:41 GMT+0100 (W. Central Africa Standard
 Time)

---
 00/title.txt  |  6 +----
 manifest.json | 61 ++++++++++++++++++++++++++-------------------------
 2 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/00/title.txt b/00/title.txt
index 7d67add..ec703a9 100644
--- a/00/title.txt
+++ b/00/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-1 TIMOTE
-=======
-1 Timote
->>>>>>> 42237d9f11e1c017b6cd988b0edbe9649e534b37
+1 TIMOTE
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index d1a8f5e..f7490eb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,31 +1,26 @@
 {
-	"project": {
-		"id": "1ti",
-		"name": ""
-	},
-	"type": {
-		"id": "text",
-		"name": "Text"
-	},
+	"package_version": 6,
+	"format": "usfm",
 	"generator": {
 		"name": "ts-desktop",
-		"build": ""
+		"build": "21"
 	},
-	"package_version": 6,
 	"target_language": {
 		"direction": "ltr",
 		"id": "sif",
 		"name": "Siamou"
 	},
-	"format": "usfm",
+	"project": {
+		"id": "1ti",
+		"name": "1 Timothy"
+	},
+	"type": {
+		"id": "text",
+		"name": "Text"
+	},
 	"resource": {
 		"id": "reg"
 	},
-	"translators": [
-		"",
-		"Solo",
-		"Lillian"
-	],
 	"source_translations": [
 		{
 			"language_id": "en",
@@ -35,20 +30,14 @@
 			"version": "5"
 		}
 	],
+	"translators": [
+		"",
+		"Solo",
+		"Lillian",
+		"Pungs"
+	],
 	"finished_chunks": [
-		"06-01",
-		"06-03",
-		"06-06",
-		"06-09",
-		"06-11",
-		"06-00",
-		"06-13",
-		"04-01",
-		"04-11",
-		"04-09",
-		"04-06",
-		"04-03",
-		"04-14",
+		"00-title",
 		"01-01",
 		"01-03",
 		"01-05",
@@ -68,6 +57,12 @@
 		"03-11",
 		"03-14",
 		"03-16",
+		"04-01",
+		"04-03",
+		"04-06",
+		"04-09",
+		"04-11",
+		"04-14",
 		"05-01",
 		"05-03",
 		"05-05",
@@ -78,6 +73,12 @@
 		"05-17",
 		"05-19",
 		"05-21",
-		"05-23"
+		"05-23",
+		"06-01",
+		"06-03",
+		"06-06",
+		"06-09",
+		"06-11",
+		"06-13"
 	]
 }
\ No newline at end of file