Mon Sep 27 2021 11:42:08 GMT+0100 (W. Central Africa Standard Time)

01/01.txt

@@ -1 +1,5 @@
-\v 1 Ni Bulus Ayam Aarikeya, ta ne aace Timotawus nen cimi dorma ne abasce da cinima Arikewa yete dawiawotaya nge filimon \v 2 Ne aace Afiya ne  Arkifus Abasce da cnimsa henda kerto ,   ne ikilisiya wu gbawi ne wa ha nda;\v 3  Bwhatem ne zangzangto wawo ne waha dega na Arikeha Adace na Adajiye Yesu Aarikewăa.
+<<<<<<< HEAD
+\v 1 Ni Bulus Ayam Aarikeya, ta ne aace Timotawus nen cimi dorma ne abasce da cinima Arikewa yete dawiawotaya nge filimon \v 2 Ne aace Afiya ne  Arkifus Abasce da cnimsa henda kerto ,   ne ikilisiya wu gbawi ne wa ha nda;\v 3  Bwhatem ne zangzangto wawo ne waha dega na Arikeha Adace na Adajiye Yesu Aarikewăa.
+=======
+\v 1 Bulus ye koyati da  pursuna dwa Yeso Kristi ya,ni amaya ya Timotawus woni Philemon ha,abazaje da cinama,,ni a maya ya \v 2 Afiya,wani Archippus abazhi cinam njemi afinda kirto, ni ikklisiya wan  gbau naha wa: \v 3 bwahatima, ni kato zangzangto wo kat naha daga na Rike ha Adanje ni Adajiye  Yeso Almasihu.
+>>>>>>> e7be6d1d83bbdbe600d5e8981f8cddd87c680d0a

01/04.txt

@@ -1 +1,5 @@
-\v 4 Kogamen nen hima Arike. cima nderrezeti  \v 5 Nenza bhatemami ne jirimsiwa zanewa aace da Dajiye Yesu. \v 6  Nen huma jirimsi wa wone maa mbi bwha tawa wo deda Almasihu.\v 7  Gufwonu pengpeng swa, kumburnu fikin ndwa bhatemami,ndwa sukze mba maa twoito lauwa aace.
+<<<<<<< HEAD
+\v 4 Kogamen nen hima Arike. cima nderrezeti  \v 5 Nenza bhatemami ne jirimsiwa zanewa aace da Dajiye Yesu. \v 6  Nen huma jirimsi wa wone maa mbi bwha tawa wo deda Almasihu.\v 7  Gufwonu pengpeng swa, kumburnu fikin ndwa bhatemami,ndwa sukze mba maa twoito lauwa aace.
+=======
+\v 4 4 ko gmin nan bwa Rike de. Nan gna cima  zha. \v 5 Ni za bhadima, ni jirimsi minga yeshiyin da Adajiye Yeso ni wa ace won mbida Rike. \v 6 Nan bwa Rike de giho nui de na jirimsi wa yi wo sogi wa wasi ma mbi buha awido ni Almasihu .Nda mi  ni wu hu bi  wuhu zun ni zemzemto ni jima zemi. \v 7 Ndwa gufuzu wan bida Arike gonga cima dwa geh ache.
+>>>>>>> e7be6d1d83bbdbe600d5e8981f8cddd87c680d0a

01/title.txt

@@ -1 +1,5 @@
-Tangera 1
+<<<<<<< HEAD
+Tangera 1
+=======
+Tangiya 1
+>>>>>>> e7be6d1d83bbdbe600d5e8981f8cddd87c680d0a

LICENSE.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 
 # License
 ## Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
@@ -25,3 +26,10 @@ The licensor cannot revoke these freedoms as long as you follow the license term
 You do not have to comply with the license for elements of the material in the public domain or where your use is permitted by an applicable exception or limitation.
 
 No warranties are given. The license may not give you all of the permissions necessary for your intended use. For example, other rights such as publicity, privacy, or moral rights may limit how you use the material.
+=======
+# License
+
+This work is made available under the Creative Commons Attribution-ShareAlike 4.0 International License (CC BY-SA). To view a copy of this license, visit [http://creativecommons.org/licenses/by-sa/4.0/](http://creativecommons.org/licenses/by-sa/4.0/) or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
+
+If you would like to notify unfoldingWord regarding your translation of this work, please contact us at [https://unfoldingword.org/contact/](https://unfoldingword.org/contact/).
+>>>>>>> e7be6d1d83bbdbe600d5e8981f8cddd87c680d0a

front/title.txt

@@ -1 +1,5 @@
-Filimon
+<<<<<<< HEAD
+Filimon
+=======
+Philemon
+>>>>>>> e7be6d1d83bbdbe600d5e8981f8cddd87c680d0a

manifest.json

@@ -25,7 +25,8 @@
 		"id": "reg"
 	},
 	"translators": [
-		"samari"
+		"samari",
+		"mary"
 	],
 	"source_translations": [
 		{
@@ -37,15 +38,11 @@
 		}
 	],
 	"finished_chunks": [
-		"front-title",
 		"01-08",
 		"01-10",
 		"01-14",
 		"01-17",
 		"01-21",
-		"01-04",
-		"01-title",
-		"01-01",
 		"01-23"
 	]
 }