Sun Apr 21 2024 06:33:25 GMT+0200 (South Africa Standard Time)

LICENSE.md

@@ -1,5 +1,8 @@
 
 <<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> 5975993722e1d2dfdf5051a3db4c24852d658eef
 ## Creative Commons Attribution-ShareAlike 4.0 International
 
 ### Human-Readable Summary 
@@ -37,6 +40,9 @@ http://creativecommons.org/licenses/by-sa/4.0/.
 
   
 
+<<<<<<< HEAD
+This PDF was generated using Prince (https://www.princexml.com/).
+=======
 This PDF was generated using Prince (https://www.princexml.com/).
 =======
 # License
@@ -68,3 +74,4 @@ No warranties are given. The license may not give you all of the permissions nec
 
 This PDF was generated using Prince (https://www.princexml.com/).
 >>>>>>> 994f9dda2944f9855314fade9434b011f877865d
+>>>>>>> 5975993722e1d2dfdf5051a3db4c24852d658eef

manifest.json

@@ -1,9 +1,9 @@
 {
-	"package_version": 7,
+	"package_version": 6,
 	"format": "usfm",
 	"generator": {
 		"name": "ts-desktop",
-		"build": "7"
+		"build": "160"
 	},
 	"target_language": {
 		"id": "cjk-ZM-chokwe",
@@ -27,8 +27,8 @@
 			"language_id": "en",
 			"resource_id": "ulb",
 			"checking_level": "3",
-			"date_modified": "2017-11-29T00:00:00+00:00",
-			"version": "12"
+			"date_modified": "2022-03-24T15:58:30.6315611+00:00",
+			"version": "21-05"
 		}
 	],
 	"parent_draft": {},