From 8a3b1a37a4064e316f6ecf07b92a40dc30f55790 Mon Sep 17 00:00:00 2001
From: tsDesktop <you@example.com>
Date: Tue, 18 Apr 2017 14:01:21 -0500
Subject: [PATCH] Tue Apr 18 2017 14:01:20 GMT-0500 (CDT)

---
 01/03.txt     | 14 ++++----------
 manifest.json | 33 +++++++++++++++++----------------
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/01/03.txt b/01/03.txt
index 84d0eec..87f2bac 100644
--- a/01/03.txt
+++ b/01/03.txt
@@ -1,10 +1,4 @@
-<<<<<<< HEAD
-\v 3 I thank my God with every thought of you,
-\v 4 Every time I pray for you, it is always a prayer of joy.
-\v 5 I give thanks for your fellowship in the gospel from the first day until now.
-\v 6 I am confident of this very thing, that he who began a good work in you will complete it until the day of Jesus Christ.
-
-
-=======
-\v 3 I thank my God with every thought of you, \v 4 Every time I pray for you, it is always a prayer of joy. \v 5 I give thanks for your fellowship in the gospel from the first day until now. \v 6 I am confident of this very thing, that he who began a good work in you will complete it until the day of Jesus Christ.
->>>>>>> 9c846c36e6fe1e25e3849ebdd67b244a745ec9f8
+\v 3 I thank my God with every thought of you,
+ \v 4 Every time I pray for you, it is always a prayer of joy.
+ \v 5 I give thanks for your fellowship in the gospel from the first day until now.
+ \v 6 I am confident of this very thing, that he who began a good work in you will complete it until the day of Jesus Christ.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index b99a0e2..ff1f0e8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,37 +1,38 @@
 {
-	"project": {
-		"id": "php",
-		"name": ""
-	},
-	"type": {
-		"id": "text",
-		"name": "Text"
-	},
+	"package_version": 7,
+	"format": "usfm",
 	"generator": {
 		"name": "ts-desktop",
 		"build": "132"
 	},
-	"package_version": 7,
 	"target_language": {
 		"direction": "ltr",
 		"id": "en-x-demo1",
 		"name": "English demo1"
 	},
-	"format": "usfm",
+	"project": {
+		"id": "php",
+		"name": "Philippians"
+	},
+	"type": {
+		"id": "text",
+		"name": "Text"
+	},
 	"resource": {
 		"id": "reg"
 	},
-	"translators": [
-		"qa99"
-	],
 	"source_translations": [
 		{
 			"language_id": "en",
 			"resource_id": "ulb",
-			"checking_level": 3,
-			"date_modified": 20160614,
-			"version": "5"
+			"checking_level": "3",
+			"date_modified": 20161227,
+			"version": "8"
 		}
 	],
+	"translators": [
+		"qa99",
+		"c"
+	],
 	"finished_chunks": []
 }
\ No newline at end of file