From a523122d70ee21156d27a72889a35119e1db6050 Mon Sep 17 00:00:00 2001
From: michael_rodriguez <michael_rodriguez@wycliffeassociates.org>
Date: Wed, 21 Jul 2021 14:53:39 -0400
Subject: [PATCH] Wed Jul 21 2021 14:53:38 GMT-0400 (Eastern Daylight Time)

---
 04/03.txt     |  6 +----
 manifest.json | 64 ++++++++++++++++++++++++++-------------------------
 2 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/04/03.txt b/04/03.txt
index 720510c..2c08b9c 100644
--- a/04/03.txt
+++ b/04/03.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 3 Laacabe que zana cabe chu' guenda richagana ne guenda rica guenda ro' ni Diuxi bizaa para guinda ne gudiini xcadi ne guenda rudi xquixhe lade ca ni ma runi cre' ne ca ni ma runibia' ni dxandi. \v 4 Ti purti guira ni bizaa diuxhi naca sicaru. Gaxti di de ni guicaanu ne guenda rudi xquixhe que zaca na. \v 5 Ti purti ma guyu ndayani pur xtida Diuxi ne pur guenda rini' ne Diuxi.
-=======
-\v 3 Laacabe que sana cabe chu guenda richagana ne guenda rica guenda ro' ni Diuxhi bizaa para guinda ne gudiini xcadi ne guenda rudi xquixhe lade ca ni ma runi cre' ne ca ni ma runibia' ni dxandi. \v 4 Ti purti guira ni bizaa diuxhi naca sicaru. Gaxti di de ni guicaanu ne guenda rudi xquixhe que zaca na. \v 5 Ti purti ma guyu ndayani pur xtida Diuxhi ne pur guenda rini' ne Diuxhi.
->>>>>>> a958b6f714342177f8eb7fb1815a5e70822348e6
+\v 3 Laacabe que zana cabe chu' guenda richagana ne guenda rica guenda ro' ni Diuxi bizaa para guinda ne gudiini xcadi ne guenda rudi xquixhe lade ca ni ma runi cre' ne ca ni ma runibia' ni dxandi. \v 4 Ti purti guira ni bizaa diuxhi naca sicaru. Gaxti di de ni guicaanu ne guenda rudi xquixhe que zaca na. \v 5 Ti purti ma guyu ndayani pur xtida Diuxi ne pur guenda rini' ne Diuxi.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index ad8f474..27f427f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,17 +1,10 @@
 {
-	"project": {
-		"id": "1ti",
-		"name": ""
-	},
-	"type": {
-		"id": "text",
-		"name": "Text"
-	},
+	"package_version": 7,
+	"format": "usfm",
 	"generator": {
 		"name": "ts-desktop",
 		"build": "7"
 	},
-	"package_version": 7,
 	"target_language": {
 		"name": "Isthmus Zapotec",
 		"direction": "ltr",
@@ -20,54 +13,63 @@
 		"is_gateway_language": false,
 		"id": "zai"
 	},
-	"format": "usfm",
+	"project": {
+		"id": "1ti",
+		"name": "1 Timothy"
+	},
+	"type": {
+		"id": "text",
+		"name": "Text"
+	},
 	"resource": {
 		"id": "reg"
 	},
-	"translators": [
-		"Emanuel Antonio Ruiz",
-		"melquisedec antonio ruiz",
-		"RAMON D ALVARADO BURGOS"
-	],
 	"source_translations": [
 		{
 			"language_id": "es-419",
 			"resource_id": "ulb",
 			"checking_level": "3",
-			"date_modified": 20191010,
+			"date_modified": "2019-10-09T00:00:00+00:00",
 			"version": "1.4"
 		}
 	],
+	"translators": [
+		"Emanuel Antonio Ruiz",
+		"melquisedec antonio ruiz",
+		"RAMON D ALVARADO BURGOS",
+		"Michael A. Rodriguez"
+	],
 	"finished_chunks": [
-		"03-16",
-		"03-14",
-		"03-11",
-		"03-08",
-		"04-06",
 		"front-title",
 		"01-title",
-		"02-title",
-		"03-title",
-		"04-title",
-		"01-05",
-		"01-03",
 		"01-01",
+		"01-03",
+		"01-05",
 		"01-09",
 		"01-12",
 		"01-15",
 		"01-18",
+		"02-title",
+		"02-01",
 		"02-05",
 		"02-08",
 		"02-11",
+		"02-13",
+		"03-title",
 		"03-01",
 		"03-04",
-		"04-01",
-		"04-09",
-		"04-14",
-		"02-01",
-		"02-13",
 		"03-06",
+		"03-08",
+		"03-11",
+		"03-14",
+		"03-16",
+		"04-title",
+		"04-01",
+		"04-03",
+		"04-06",
+		"04-09",
 		"04-11",
+		"04-14",
 		"05-title",
 		"05-01",
 		"05-03",