From 5adac5dbb993f3b480a82dcc7dabd85096e66429 Mon Sep 17 00:00:00 2001
From: tsDesktop <you@example.com>
Date: Mon, 29 Jul 2019 00:20:51 -0700
Subject: [PATCH] Mon Jul 29 2019 00:20:49 GMT-0700 (Pacific Daylight Time)

---
 front/title.txt |   6 +-
 manifest.json   | 151 ++++++++++++++++++++++++------------------------
 2 files changed, 78 insertions(+), 79 deletions(-)

diff --git a/front/title.txt b/front/title.txt
index 0872707..83943a6 100755
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Mak
-=======
-mak
->>>>>>> 0be6ef0d3e2333231635988a7513bf9cc571f553
+Mak
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index a4d9b38..02b93f7 100755
--- a/manifest.json
+++ b/manifest.json
@@ -1,4 +1,10 @@
 {
+	"package_version": 7,
+	"format": "usfm",
+	"generator": {
+		"name": "ts-desktop",
+		"build": "132"
+	},
 	"target_language": {
 		"id": "bmh-x-jaru",
 		"region": "Pacific",
@@ -9,20 +15,69 @@
 	},
 	"project": {
 		"id": "mrk",
-		"name": ""
+		"name": "Mark"
+	},
+	"type": {
+		"id": "text",
+		"name": "Text"
 	},
-	"translators": [
-		"lex mongos",
-		"samuel"
-	],
 	"resource": {
 		"id": "reg"
 	},
-	"generator": {
-		"build": "132",
-		"name": "ts-desktop"
-	},
+	"source_translations": [
+		{
+			"language_id": "en",
+			"resource_id": "ulb",
+			"checking_level": "3",
+			"date_modified": 20170329,
+			"version": "9"
+		}
+	],
+	"translators": [
+		"lex mongos",
+		"samuel",
+		"wa"
+	],
 	"finished_chunks": [
+		"front-title",
+		"01-title",
+		"01-01",
+		"01-04",
+		"01-07",
+		"01-09",
+		"01-12",
+		"01-14",
+		"01-16",
+		"01-19",
+		"01-21",
+		"01-23",
+		"01-27",
+		"01-29",
+		"01-32",
+		"01-35",
+		"01-38",
+		"01-40",
+		"01-43",
+		"01-45",
+		"05-title",
+		"05-01",
+		"05-03",
+		"05-05",
+		"05-07",
+		"05-09",
+		"05-11",
+		"05-14",
+		"05-16",
+		"05-18",
+		"05-21",
+		"05-25",
+		"05-28",
+		"05-30",
+		"05-33",
+		"05-35",
+		"05-36",
+		"05-39",
+		"05-41",
 		"06-title",
 		"06-01",
 		"06-04",
@@ -36,6 +91,7 @@
 		"06-23",
 		"06-26",
 		"06-30",
+		"06-33",
 		"06-35",
 		"06-37",
 		"06-39",
@@ -45,24 +101,6 @@
 		"06-51",
 		"06-53",
 		"06-56",
-		"06-33",
-		"16-title",
-		"16-01",
-		"16-03",
-		"16-05",
-		"16-08",
-		"16-09",
-		"16-12",
-		"16-14",
-		"16-17",
-		"16-19",
-		"01-04",
-		"01-07",
-		"01-12",
-		"01-27",
-		"05-title",
-		"05-03",
-		"05-16",
 		"07-title",
 		"07-01",
 		"07-02",
@@ -79,36 +117,6 @@
 		"07-31",
 		"07-33",
 		"07-36",
-		"05-41",
-		"05-39",
-		"05-36",
-		"05-35",
-		"05-33",
-		"05-30",
-		"05-28",
-		"05-25",
-		"05-21",
-		"05-18",
-		"05-14",
-		"05-11",
-		"05-09",
-		"05-07",
-		"05-05",
-		"05-01",
-		"01-45",
-		"01-43",
-		"01-40",
-		"01-38",
-		"01-35",
-		"01-32",
-		"01-29",
-		"01-23",
-		"01-21",
-		"01-19",
-		"01-16",
-		"01-14",
-		"01-09",
-		"01-01",
 		"08-title",
 		"08-01",
 		"08-05",
@@ -140,21 +148,16 @@
 		"13-28",
 		"13-30",
 		"13-33",
-		"13-35"
-	],
-	"format": "usfm",
-	"type": {
-		"id": "text",
-		"name": "Text"
-	},
-	"source_translations": [
-		{
-			"resource_id": "ulb",
-			"language_id": "en",
-			"date_modified": 20170329,
-			"version": "9",
-			"checking_level": "3"
-		}
-	],
-	"package_version": 7
+		"13-35",
+		"16-title",
+		"16-01",
+		"16-03",
+		"16-05",
+		"16-08",
+		"16-09",
+		"16-12",
+		"16-14",
+		"16-17",
+		"16-19"
+	]
 }
\ No newline at end of file