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

01/01.txt

@@ -1 +1,5 @@
-\v 1 Yahuda, ayam, Yesu Almasihuya mwabo aama Yakubu, won wawo Arike Adaa yeri wotyi wu tafi wotiwa ndwa Yesu Kristi; \v 2 Gwa ,myeto ne kato zangzagto ne dauwo wata wo gushi nezaha.
+<<<<<<< HEAD
+\v 1 Yahuda, ayam, Yesu Almasihuya mwabo aama Yakubu, won wawo Arike Adaa yeri wotyi wu tafi wotiwa ndwa Yesu Kristi; \v 2 Gwa ,myeto ne kato zangzagto ne dauwo wata wo gushi nezaha.
+=======
+\v 1 Yahuza, a yam Yeso ya aa ma yakubuya mwa, wonǝ wa wau yariwati nda, wan dawawata ɗa ndǝrra Arike Ada, wawa fwati dwa Yeso kǝrǝstiwa.\v 2  Ma fanda kato mayãto ni kato zangzangto nǝ dauwawata, wa kat gushi ɗaza
+>>>>>>> ec66fdb23c8796a96b343a6337209ca33a42df59

01/title.txt

@@ -1 +1,5 @@
-Tanger1
+<<<<<<< HEAD
+Tanger1
+=======
+Tanggǝra 1
+>>>>>>> ec66fdb23c8796a96b343a6337209ca33a42df59

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/).
+>>>>>>> ec66fdb23c8796a96b343a6337209ca33a42df59

front/title.txt

@@ -1 +1,5 @@
-Yahuda
+<<<<<<< HEAD
+Yahuda
+=======
+Jude
+>>>>>>> ec66fdb23c8796a96b343a6337209ca33a42df59

manifest.json

@@ -25,7 +25,8 @@
 		"id": "reg"
 	},
 	"translators": [
-		"samari"
+		"samari",
+		"KEFAS  Sama'ila."
 	],
 	"source_translations": [
 		{
@@ -37,9 +38,6 @@
 		}
 	],
 	"finished_chunks": [
-		"front-title",
-		"01-title",
-		"01-01",
 		"01-03",
 		"01-05",
 		"01-07",