auto save

03/16.txt

@@ -1 +1,5 @@
-\v 16 Maoki noose mokonga miki ma kotoka, kofea mo kongesa ko météma ya bato mo kotimbola, na koébésa mo n'kati ya liti. \v 17 Moto wa ao kotondanésa, Mokonga wa phénene n'kati ya maondi masaali.
+<<<<<<< HEAD
+\v 16 Maoki noose mokonga miki ma kotoka, kofea mo kongesa ko météma ya bato mo kotimbola, na koébésa mo n'kati ya liti. \v 17 Moto wa ao kotondanésa, Mokonga wa phénene n'kati ya maondi masaali.
+=======
+\v 16 Na buwa kotowa, koisama ka bophe neni yee me : ôwa wa esele kanga omobe, kolo ngeya Omosombo, komoneka ô Bakitomo, konangolea obato, koa koleka mo chese, nako yayoka koa kiyo moo kuku.
+>>>>>>> refs/heads/new

04/03.txt

@@ -1 +1,5 @@
-\v 3 M'mba wa yoba-yoba. uto kopka andé omoësi owa toose, ké wa ésana motuka ya mkota ya bakpi. \v 4 ko opesana na éya si éya ika, timbola itú ya liti mo baa baüwa na  tshékamba. owe ika baka, ko aphya obaba, ko mékambo ya kolondowa. \v 5 Endjeka mékambo yabè, mondiya noota n'kasi mo n'nyanga ya nè ya kiya.
+<<<<<<< HEAD
+\v 3 M'mba wa yoba-yoba. uto kopka andé omoësi owa toose, ké wa ésana motuka ya mkota ya bakpi. \v 4 ko opesana na éya si éya ika, timbola itú ya liti mo baa baüwa na  tshékamba. owe ika baka, ko aphya obaba, ko mékambo ya kolondowa. \v 5 Endjeka mékambo yabè, mondiya noota n'kasi mo n'nyanga ya nè ya kiya.
+=======
+\v 1  Looki sieno iki boobo : aika m'ba moto waika na kumbo wa koeka motoli wa bose, wae maki n'kasi ya fowa.\v 2 Ke ye fowe hui Motoli wa bose wa ike bua wa koe neka, amoome wa amomokali omo, moto wa bii, koika osahali n'kati ya bato, owa opokeya bato, kolondo leya bato osahali : \v 3 Ite wowe ande waeke koika kanda omalu,bua iyeya, moto wa moboto, bihi buwa koema m'fala nga. \v 4 Efowe wa endese basaboli lumba yande, na obendesa baaua bannde mo koselela na n'kati ya lite siya yaengame,
+>>>>>>> refs/heads/new

front/title.txt

@@ -1 +1 @@
-2 Timoté
+2 Timote

manifest.json

@@ -1 +1 @@
-{"project":{"id":"2ti","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":2},"package_version":7,"target_language":{"name":"Enya","direction":"ltr","anglicized_name":"Enya","region":"Africa","is_gateway_language":false,"id":"gey"},"format":"usfm","resource":{"id":"reg"},"translators":["Faustin-azaza","garryg"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":"2017-11-29T00:00:00+00:00","version":"12"}],"finished_chunks":["03-01","03-05","03-08","03-10","03-14","03-16","02-01","02-03","02-06","02-08","02-11","02-14","02-16","02-19","02-22","02-24","01-12","01-15","04-01","04-03","04-06","04-09","04-11","04-14","04-17","04-19","01-title","01-03","01-06","01-08","02-title","03-title","04-title","01-01","front-title"]}
+{"project":{"id":"2ti","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":2},"package_version":7,"target_language":{"name":"Enya","direction":"ltr","anglicized_name":"Enya","region":"Africa","is_gateway_language":false,"id":"gey"},"format":"usfm","resource":{"id":"reg"},"translators":["Faustin-azaza","garryg","fousten"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":"2017-11-29T00:00:00+00:00","version":"12"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"}],"finished_chunks":["03-01","03-05","03-08","03-10","03-14","03-16","02-01","02-03","02-06","02-08","02-11","02-14","02-16","02-19","02-22","02-24","01-12","01-15","04-01","04-03","04-06","04-09","04-11","04-14","04-17","04-19","01-title","01-03","01-06","01-08","02-title","03-title","04-title","01-01"]}