Mon May 29 2017 11:56:47 GMT+0300 (E. Africa Standard Time)

01/01.txt

@@ -1 +1,5 @@
-\c 1 \v 1 ሽማግሌው በእውነት ለምወደውና ለተወደደው ጋይዮስ። \v 2 የተወደድክ ሆይ በነፍስህ እንደበለጸግህ በሁሉ ነገር እንድትበለጽግና በመልካም ጤንነት እንድትሆን እጸልያለሁ። \v 3 ወንድሞች መጥተው በእውነት እንደምትሄድ ሲመሰክሩልኝ እጅግ ሀሴት አደረግሁኝ። \v 4 ልጆቼ በእውነት መንገድ እየሄዱ እንደሆነ ከመስማት የበለጠ ደስታ የለኝም።
+<<<<<<< HEAD
+\c 1 \v 1 ሽማግሌው በእውነት ለምወደውና ለተወደደው ጋይዮስ። \v 2 የተወደድክ ሆይ በነፍስህ እንደበለጸግህ በሁሉ ነገር እንድትበለጽግና በመልካም ጤንነት እንድትሆን እጸልያለሁ። \v 3 ወንድሞች መጥተው በእውነት እንደምትሄድ ሲመሰክሩልኝ እጅግ ሀሴት አደረግሁኝ። \v 4 ልጆቼ በእውነት መንገድ እየሄዱ እንደሆነ ከመስማት የበለጠ ደስታ የለኝም።
+=======
+\v 1 ሽማግሌው በእውነት ለምወደውና ለተወደደው ጋይዮስ። \v 2 የተወደድክ ሆይ በነፍስህ እንደበለጸግህ በሁሉ ነገር እንድትበለጽግና በመልካም ጤንነት እንድትሆን እጸልያለሁ። \v 3 ወንድሞች መጥተው በእውነት እንደምትሄድ ሲመሰክሩልኝ እጅግ ሀሴት አደረግሁኝ። \v 4 ልጆቼ በእውነት መንገድ እየሄዱ እንደሆነ ከመስማት የበለጠ ደስታ የለኝም።
+>>>>>>> 7367d0543052c50f14a574d14ca71376c3405d00

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,32 @@ 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 [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.
+
+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.
+>>>>>>> 7367d0543052c50f14a574d14ca71376c3405d00

front/title.txt

@@ -1 +1,5 @@
-3 ዮሐንስ
+<<<<<<< HEAD
+3 ዮሐንስ
+=======
+3 John
+>>>>>>> 7367d0543052c50f14a574d14ca71376c3405d00

manifest.json

@@ -37,9 +37,7 @@
 		"Burje Duro"
 	],
 	"finished_chunks": [
-		"front-title",
 		"01-title",
-		"01-01",
 		"01-05",
 		"01-09",
 		"01-11",