Thu Jun 22 2017 13:41:26 GMT+0100 (W. Central Africa Standard Time)

01/01.txt

@@ -1 +1,5 @@
-\v 1 Bulus a ɗeino kusa Kiristi Yeso ki bo ndala Ndeyi yo wan ngumu ki Kiristi Yeso 'yak dibna mu, \v 2 Ki TImoti, lah yo jire a tong ona jire: Tili moɗi, jikyayi, ki ɗeino lahiya ki ygem Ndeyi boti ki Kiristi Yeso bomu a bano.
+<<<<<<< HEAD
+\v 1 Bulus a ɗeino kusa Kiristi Yeso ki bo ndala Ndeyi yo wan ngumu ki Kiristi Yeso 'yak dibna mu, \v 2 Ki TImoti, lah yo jire a tong ona jire: Tili moɗi, jikyayi, ki ɗeino lahiya ki ygem Ndeyi boti ki Kiristi Yeso bomu a bano.
+=======
+\c 1 \v 1 Bulus a ɗeono kusa Kiristi Yeso ki bo dalla Ndeyi yo wang ngo mu ki kiristi 'yak ki dibnak mu. \v 2 Ki Timoti lah yo jire tong ona jire, lahiya, ki jikyayi ki lahiyak kigym Ndeyi ki Kiristi Yeso bomu a bano.
+>>>>>>> 579d7828684227b8b3ece89dbcd3763158a7ecc9

01/03.txt

@@ -1 +1,5 @@
-\v 3 Kit yo sauwa anshenko ko 'e ki bon gonno Makidoniya ta ko duk sheke a Afisa ko anik biya ma'ato kada zuni shutante Adak biyai maɗɗi bu. \v 4 Kada yabte ɗeino ka kola somok zurya bu. A moktu shana ki habta be'i erno ka a ramta eni Ndeyi, ki be'i ona jire.
+<<<<<<< HEAD
+\v 3 Kit yo sauwa anshenko ko 'e ki bon gonno Makidoniya ta ko duk sheke a Afisa ko anik biya ma'ato kada zuni shutante Adak biyai maɗɗi bu. \v 4 Kada yabte ɗeino ka kola somok zurya bu. A moktu shana ki habta be'i erno ka a ramta eni Ndeyi, ki be'i ona jire.
+=======
+\v 4 \v 3 Kit yong sauwa an shenko ko e ki bong gono maɗi doniya ta ko duksheko a sfisa ko enik biya ma'ato suni kada shuteso'oto shuyuu yo so'oto.\v 4 Kada yabta ɗeino kola dintir so'o
+>>>>>>> 579d7828684227b8b3ece89dbcd3763158a7ecc9

01/title.txt

@@ -0,0 +1 @@
+Zura 1

LICENSE.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ## License:
 
 This work is made available under a Creative Commons Attribution-ShareAlike 4.0 International License (http://creativecommons.org/licenses/by-sa/4.0/).
@@ -13,3 +14,34 @@ This work is made available under a Creative Commons Attribution-ShareAlike 4.0
 **Attribution** - You must attribute the work as follows: "Original work available at https://door43.org/." Attribution statements in derivative works should not in any way suggest that we endorse you or your use of this work.
 
 **ShareAlike** - If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.
+=======
+
+# License
+## Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
+
+This is a human-readable summary of (and not a substitute for) the full license found at http://creativecommons.org/licenses/by-sa/4.0/.
+
+### You are free to:
+
+  * **Share** — copy and redistribute the material in any medium or format
+  * **Adapt** — remix, transform, and build upon the material 
+
+for any purpose, even commercially.
+
+The licensor cannot revoke these freedoms as long as you follow the license terms.
+
+### Under the following conditions:
+
+  * **Attribution** — You must attribute the work as follows: "Original work available at https://door43.org/." Attribution statements in derivative works should not in any way suggest that we endorse you or your use of this work.
+  * **ShareAlike** — If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.
+
+**No additional restrictions** — You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits.
+
+### Notices:
+
+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.
+
+This PDF was generated using Prince (https://www.princexml.com/).
+>>>>>>> 579d7828684227b8b3ece89dbcd3763158a7ecc9

front/title.txt

@@ -1 +1,5 @@
-Timoti so moɗi
+<<<<<<< HEAD
+Timoti so moɗi
+=======
+1 timoti
+>>>>>>> 579d7828684227b8b3ece89dbcd3763158a7ecc9

manifest.json

@@ -25,7 +25,8 @@
 		"nbh3-nig",
 		"nbh1-nig",
 		"Ngamo2",
-		"MAST"
+		"MAST",
+		"Ora Bible Project 2"
 	],
 	"source_translations": [
 		{
@@ -55,15 +56,12 @@
 		"05-19",
 		"05-21",
 		"05-23",
-		"front-title",
 		"04-01",
 		"04-03",
 		"04-06",
 		"04-09",
 		"04-11",
 		"04-14",
-		"01-01",
-		"01-03",
 		"01-05",
 		"01-09",
 		"01-12",
@@ -82,6 +80,7 @@
 		"06-13",
 		"06-15",
 		"06-17",
-		"06-20"
+		"06-20",
+		"01-title"
 	]
 }