auto save

04/title.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-Kharak Na 4
-=======
 Kharak 4
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:Atsam/cch_rom_text_reg.git

05/10.txt

@@ -1,6 +1,2 @@
-<<<<<<< HEAD
 \v 10 Run mmakhi she nkangmat Bawai akummat nghe nwur tsanna,de yeke a kammat ghe, aghi shezi mat ni tsas gna.
 \v 11 Nbanihum ma, nda kenipi nBawai rhuzhi ngheg Mba mat Jesu Kristo, rhuzhi ngheg gna nsok kumi
-=======
-\v 10 Ajeni, makhi shye inye sai gaba, A gyen mat ngyeghe Bawai ta same wur Tsan nha, humbe, bays gyezi nwut ngyeghe Bawai nghi sonzi  shyezi ta ngyeghe tsas a. \v 11 Ba ka ngho kawai ba, Mma inghi zizi kyeni pi nghek Bawai ta nanzin Jesu Kristo ye shezi mat,  ta ngyeghe noshe in Wok shezi.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:Atsam/cch_rom_text_reg.git

05/12.txt

@@ -1,6 +1,2 @@
-<<<<<<< HEAD
 \v 12 Kha yende rhuzhi ngheg syei ndong guug rhen nghinu gno, rhe hum wur then data rhuzhi nghug. Wur bai yhe asyai sussuk, the guug
 \v 13 Sai yezhi dokha guug jen nyhinngna mma ba a da Barack ba da yeke bada dokha ba.
-=======
-\v 12 are him, rye sai ndong guug ran nkut, humbe kuma wur ran rye guug. Wur natsi dazi inye sai sussuk, don duk azi guug. \v 13 Kafin gyezi doka, guuk Jan in kut, Mma ba Barak a guuk tunda doka Jan ba.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:Atsam/cch_rom_text_reg.git

05/14.txt

@@ -1,6 +1,2 @@
-<<<<<<< HEAD
 \v 14 Nihum, wur azhi malaki rhuzi makhi Adamu yhezi Musa har ngheg a Moshe ba azhi agug henghe na Adamu ba na sak kharhak bin, nohye ghe ananzhin nahye Adamu
 \v 15 Mma Milan ba zhi hanghe a vie zizhi ba. Ajene vie zhizhi syei ndong asyai ni khankhan akus, nne barki Bawai ni milak barki rhuzhi nsyai ndong, Jesu Kristo, asho yhe akeng asyai ni khankhan!
-=======
-\v 14 Duo ni him wur zi mulki ruzi in Adamu har dazi Musa,  duo na noshe ba a zi a guuk hanghe Adamu ba,Noshe a marak na noshe aghi daru. \v 15 Mma milak ghu ba'a zi hange guuk ba. Ajendan guuk sai ndong zi wur a sai ni kankan, Humbe nizi Bawai ni milak na Sai ndong, Jesu Kristi, aghi sho rye a sai ni kankan!
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:Atsam/cch_rom_text_reg.git

05/title.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-Kharak Na 5
-=======
 Kharak 5
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:Atsam/cch_rom_text_reg.git

manifest.json

@@ -1 +1 @@
-{"project":{"id":"rom","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":3},"package_version":7,"target_language":{"name":"Atsam","direction":"ltr","anglicized_name":"Atsam","region":"Africa","is_gateway_language":false,"id":"cch"},"format":"usfm","resource":{"id":"reg"},"translators":["Atsam"],"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":20170329,"version":"9"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"}],"finished_chunks":["01-title","front-title","02-title","01-07","01-08","01-11","01-13","01-16","01-18","01-20","01-24","01-26","01-28","01-29","01-32","02-01","02-03","02-05","02-08","02-10","02-13","02-15","02-17","02-21","04-title","05-title","11-35","11-33","11-30","11-28","11-26","11-25","11-17","11-15","11-13","11-11","11-09","11-04","10-20","10-19","10-18","10-16","10-14","10-11","10-08","10-06","10-04","10-01","09-30","03-07","03-03","03-01","12-title","13-title","14-title","15-title","16-title","16-27","16-25","16-21","16-19","16-17","16-15","16-12","16-09","16-06","16-03","15-33","15-30","15-28","15-26","15-24","15-22","15-20","15-17","15-15","15-14","15-13","15-12","15-08","15-05","15-03","15-01","14-22","14-18","14-16","14-14","14-12","14-10","14-07","14-05","14-03","14-01","13-11","13-06","13-03","13-01","12-19","12-17","12-14","12-11","12-09","12-06","12-04","12-03","11-22","11-19","09-25","09-22","09-17","09-10","09-08","08-37","08-35","08-33","08-31","08-28","08-26","08-23","08-20","08-18","08-16","08-14","08-12","08-11","07-24","07-22","07-17","07-15","07-13","07-11","07-09","07-07","07-06","07-04","07-02","07-01","06-22","06-19","06-17","06-15","06-12","06-10","06-08","06-06","06-04","06-01","05-06","05-03","05-01","04-23","04-20","04-18","04-16","04-13","04-11","04-09","04-06","04-04","04-01","03-31","03-29","03-27","03-25","03-23","03-21","03-19","03-15","03-11","03-09","02-23","08-01","08-03","08-09","05-08","05-10","05-12","05-14","05-20","15-10","16-01","16-23","01-01","01-04","01-22","03-05","03-13"]}
+{"project":{"id":"rom","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":3},"package_version":7,"target_language":{"name":"Atsam","direction":"ltr","anglicized_name":"Atsam","region":"Africa","is_gateway_language":false,"id":"cch"},"format":"usfm","resource":{"id":"reg"},"translators":["Atsam"],"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":20170329,"version":"9"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"}],"finished_chunks":["01-title","front-title","02-title","01-07","01-08","01-11","01-13","01-16","01-18","01-20","01-24","01-26","01-28","01-29","01-32","02-01","02-03","02-05","02-08","02-10","02-13","02-15","02-17","02-21","11-35","11-33","11-30","11-28","11-26","11-25","11-17","11-15","11-13","11-11","11-09","11-04","10-20","10-19","10-18","10-16","10-14","10-11","10-08","10-06","10-04","10-01","09-30","03-07","03-03","03-01","12-title","13-title","14-title","15-title","16-title","16-27","16-25","16-21","16-19","16-17","16-15","16-12","16-09","16-06","16-03","15-33","15-30","15-28","15-26","15-24","15-22","15-20","15-17","15-15","15-14","15-13","15-12","15-08","15-05","15-03","15-01","14-22","14-18","14-16","14-14","14-12","14-10","14-07","14-05","14-03","14-01","13-11","13-06","13-03","13-01","12-19","12-17","12-14","12-11","12-09","12-06","12-04","12-03","11-22","11-19","09-25","09-22","09-17","09-10","09-08","08-37","08-35","08-33","08-31","08-28","08-26","08-23","08-20","08-18","08-16","08-14","08-12","08-11","07-24","07-22","07-17","07-15","07-13","07-11","07-09","07-07","07-06","07-04","07-02","07-01","06-22","06-19","06-17","06-15","06-12","06-10","06-08","06-06","06-04","06-01","05-06","05-03","05-01","04-23","04-20","04-18","04-16","04-13","04-11","04-09","04-06","04-04","04-01","03-31","03-29","03-27","03-25","03-23","03-21","03-19","03-15","03-11","03-09","02-23","08-01","08-03","08-09","05-08","05-20","15-10","16-01","16-23","01-01","01-04","01-22","03-05","03-13","05-14"]}