diff --git a/01/01.txt b/01/01.txt index 5293ae01..35579900 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1 +1,5 @@ -\v 1 \v 2 \v 3 Magemi Jerusalemi yeravepaya, Betafes nampa Betani adeade oraveye \ No newline at end of file +<<<<<<< HEAD +\v 1 \v 2 \v 3 Magemi Jerusalemi yeravepaya, Betafes nampa Betani adeade oraveye +======= +\v 1 \v 2 \v 3 Minimi Jisasi, Koti aga anoni agoyam waya.Wafa aisayami kasanampa waita agantamagam, "amoo , semi seti yogam waita sasakama yigenti orasika ranami, bemi yigenti ami uvisitem.Mana wayini arantano kamapikem arama sem, jisasi ni ann ategago. +>>>>>>> 8497b0edee31d9cd96b821969fd002e9def1072f diff --git a/01/04.txt b/01/04.txt new file mode 100644 index 00000000..6d23cac5 --- /dev/null +++ b/01/04.txt @@ -0,0 +1 @@ +\v 5 \v 4 Jonimi yeravemi, kamapimi nomi \v 6 feyikevem,monowayami mani sirem semi, siguno sirega nom fedega yigenti kumi yiratem. Masidem magu judiyakem nampa,masidem watanasi jerusalemikem be wapa bemono. yemi be wapakem nom maro fedepaya jodeni nopim, yenti kumi sima fawaremono. Joni kemori ayauga uwantamagam sota uremi, amunanti antaurem, fintoo nampa wokafum nemmi. \ No newline at end of file diff --git a/01/title.txt b/01/title.txt index 6a74b06a..4dd836e6 100644 --- a/01/title.txt +++ b/01/title.txt @@ -1 +1,5 @@ -Anafim 1 \ No newline at end of file +<<<<<<< HEAD +Anafim 1 +======= +Maki 1 Anafim +>>>>>>> 8497b0edee31d9cd96b821969fd002e9def1072f diff --git a/LICENSE.md b/LICENSE.md index e8d64eb0..bba8a1ad 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -13,6 +13,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD 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/. ======= This is a human-readable summary of (and not a substitute for) the [license](http://creativecommons.org/licenses/by-sa/4.0/). @@ -47,6 +48,9 @@ This is a human-readable summary of (and not a substitute for) the [license](htt ======= This is a human-readable summary of (and not a substitute for) the [license](http://creativecommons.org/licenses/by-sa/4.0/). >>>>>>> 21033f61922f56fa6c1b013f867520f5c9df7d10 +======= +This is a human-readable summary of (and not a substitute for) the [license](http://creativecommons.org/licenses/by-sa/4.0/). +>>>>>>> 8497b0edee31d9cd96b821969fd002e9def1072f ### You are free to: @@ -80,6 +84,7 @@ No warranties are given. The license may not give you all of the permissions nec <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD This PDF was generated using Prince (https://www.princexml.com/). ======= @@ -108,3 +113,5 @@ This PDF was generated using Prince (https://www.princexml.com/). >>>>>>> db185da59bf0f3dea70cb6da6deedf820d70ee02 ======= >>>>>>> 21033f61922f56fa6c1b013f867520f5c9df7d10 +======= +>>>>>>> 8497b0edee31d9cd96b821969fd002e9def1072f diff --git a/manifest.json b/manifest.json index b1ec63bf..a6d37d57 100644 --- a/manifest.json +++ b/manifest.json @@ -44,12 +44,11 @@ "Maslyn Ezicks", "Noel Davis", "Emelda Yumito", - "sellyn karl" + "sellyn karl", + "Bradley Philip" ], "finished_chunks": [ "front-title", - "01-title", - "01-01", "01-04", "01-07", "01-09",