Wed Jul 26 2017 19:55:43 GMT+0100 (Paris, Madrid)

03/09.txt

@@ -1 +1,5 @@
-\v 10 \v 11 \v 9 Tonani tembe ya booka ekiya otangi makokombo mayike ma mikotiya, phé na miwanyo na tembe ya eyeni mibeko. tona binda bango yomu edi inda ya masi edjangi tina.
+<<<<<<< HEAD
+\v 10 \v 11 \v 9 Tonani tembe ya booka ekiya otangi makokombo mayike ma mikotiya, phé na miwanyo na tembe ya eyeni mibeko. tona binda bango yomu edi inda ya masi edjangi tina.
+=======
+\v 10 Soki moto ameki ekambi indeko beke miteya mbala moto , na ya mbala ibale soki bobo e wokini awe tika ango. \v 11 yebabo moto wa ndengue yemu agnangani o nguiya a tumi na bikuna adi ewasoli itumbu.
+>>>>>>> e2f8d3df89a69117418b574b6c760376b0bb0a05

03/12.txt

@@ -0,0 +1 @@
+\v 12 Leli ya ngai etindi a we ateme na tisike keyani budi inda etakani na ngai na Nikopola inda ngai na dingui edjali  phiya o ndako ya phiyo. \v 13 Zena adi mukoyi ngamon ya Polo badi edjoyi mubembo mwa bango o sali saka bango elamu inda batiki edjangui ekana yotoo imi.

03/14.txt

@@ -0,0 +1 @@
+\14 Elongui bato babiso bayebi esepelisi be bawasa isungui, badi ekumisi misala ma tina.

03/15.txt

@@ -0,0 +1 @@
+\v 15 Bango ba kima badi na ngai ba beki awe mbote , beke mbote na be badinga inabino saseyi ye yambuyi. Bolamu bwa Nzambe budjali na inabino bakima.

LICENSE.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 
 # License
 ## Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
@@ -27,3 +28,20 @@ You do not have to comply with the license for elements of the material in the p
 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/).
+=======
+## License:
+
+This work is made available under a Creative Commons Attribution-ShareAlike 4.0 International License (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.
+
+### 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.
+>>>>>>> e2f8d3df89a69117418b574b6c760376b0bb0a05

manifest.json

@@ -33,7 +33,8 @@
 	],
 	"parent_draft": {},
 	"translators": [
-		"Yves-booto"
+		"Yves-booto",
+		"Mikagnya"
 	],
 	"finished_chunks": [
 		"front-title",
@@ -59,6 +60,9 @@
 		"03-03",
 		"03-04",
 		"03-06",
-		"03-08"
+		"03-08",
+		"03-12",
+		"03-14",
+		"03-15"
 	]
 }