Sat Aug 06 2016 06:57:53 GMT+0100 (W. Central Africa Standard Time)

06/01.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
 \c 6 \v 1 Le enu xɔn wo yomɛa yesu djo yi galilea o to godo tsi ogbe yɔnɔn be tibériade. \v 2 Amɛwo sugbɔ dje yomɛ ni ɖo wo dosi ŋdandonu tsi wo yi le wawa le donɔn wo ŋti. \v 3 Yesu djo yi etoɔ o axadji vɛyi nɔn anyi kudo yio nukplaviwo.
-=======
-\v 1 Le enu xɔn wo yomɛa yesu  djo yi galilea o to godo tsi ogbe yɔnɔn be  tibériade. \v 2  Amɛwo sugbɔ dje yomɛ ni ɖo wo dosi  ŋdandonu tsi wo yi le wawa le donɔn wo ŋti. \v 3  Yesu djo yi etoɔ o axadji vɛyi nɔn anyi kudo yio nukplaviwo.
->>>>>>> 29030114d4ca22de2cda360e96bcf7fa0f6f0566

06/04.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 4 (Paké, juifu wo xué gogo). \v 5 Exɔ̂ a, yesu kɔ ta yi dji yi ikpɔ amɛha ganɖe zɔngbɔnɔ̂ egbɔ, etonɛ filipo be: fiɖe mi la xlué kpɔnɔn le a sɔ na ŋɖuɖu amɛ gbogbo tsɛwo ! \v 6 (Exɔ̂ a yesu le enyɔ̂ tsɛ wo nuɔ asɔ do filipo kpo ɖo yeŋtɔ nya enu tsi yi ledja wa).
-=======
-\v 4 (Paké, yudatɔ'wó xué gogo).\v 5   Exɔ̂ a, yesu kɔ ta yi dji yi ikpɔ amɛha ganɖe zɔngbɔnɔ̂ egbɔ, etonɛ filipo be: fiɖe mi la xlué kpɔnɔn le a sɔ na ŋɖuɖu amɛ gbogbo tsɛwo ? \v 6 (Exɔn a yesu le enyɔn tsɛ wo nuɔ asɔ do filipo kpo ɖo yeŋtɔ nya enu tsi yi i le dja wa).
->>>>>>> 29030114d4ca22de2cda360e96bcf7fa0f6f0566

manifest.json

@@ -3,7 +3,7 @@
 	"format": "usfm",
 	"generator": {
 		"name": "ts-desktop",
-		"build": ""
+		"build": "25"
 	},
 	"target_language": {
 		"id": "ajg",
@@ -122,6 +122,13 @@
 		"05-28",
 		"05-30",
 		"05-33",
+		"05-36",
+		"05-39",
+		"05-41",
+		"05-43",
+		"05-45",
+		"06-01",
+		"06-04",
 		"06-38",
 		"06-41",
 		"06-48",