diff --git a/01/title.txt b/01/title.txt new file mode 100644 index 0000000..18aaa98 --- /dev/null +++ b/01/title.txt @@ -0,0 +1 @@ +Japta 1 \ No newline at end of file diff --git a/02/01.txt b/02/01.txt index 910828f..ad64ef8 100644 --- a/02/01.txt +++ b/02/01.txt @@ -1,3 +1,7 @@ +<<<<<<< HEAD \v 1 Jisas i bon long Judia long taon ia Betlehem long taem ia Herod i king, blong olgeta .Nao long taem ia i kat sam waes man oli aot long is oli kam long Jerusalem. \v 2 Nao oli askem se,'' Pikinini ia we i jes bon we hemi king blong ol laen blong israel, hem i stap wea? Mifala i luk sta ia long is nao mifala i folem blong kam wosipim hem.\v 3 -Taem king Herod i harem ol tok ia, hem i wari we mo ol man Jerusalem tu oli harem nogud. \ No newline at end of file +Taem king Herod i harem ol tok ia, hem i wari we mo ol man Jerusalem tu oli harem nogud. +======= +\v 1 Afta we Jisas i bon long Betlehem long taon blong Judea long taem blong king Herod, igat ol waes man long is oli kamtru long Jerusalem oli talem se, \v 2 " Wem Pikinini ya we i bon we hemi king blong ol man Jiu? Mifala i luk sta blong hem long is, hemia nao mifala ikam blong wosipim hem." \v 3 Taem king Herod i harem, hemi harem nogud tumas, mo evriwan long Jerusalem tu. +>>>>>>> 896319134279cbf353eb51508e71ea71b2f93025 diff --git a/02/04.txt b/02/04.txt index d42be39..bf8883a 100644 --- a/02/04.txt +++ b/02/04.txt @@ -1,2 +1,6 @@ +<<<<<<< HEAD \v 4 Herod i singaotem ol jif pris mo ol tija blong Loa mo askem olgeta se,'' Wea nao bambae Kraes I bon?" \v 5 Nao oli talem long hem se long Judia, long taon blong Betlehem bae hemi bon from bifo profet i bin raetemaot.\v 6 -'Be long graon blong Judah, long taon ya Betlehem, we I no laswan olgeta insaed long ol rulas blong Judah, long yu bae ikat wan we bae hemi rul, hem nao bae I olsem man blo lukaot ol man blong mi Israel.'" \ No newline at end of file +'Be long graon blong Judah, long taon ya Betlehem, we I no laswan olgeta insaed long ol rulas blong Judah, long yu bae ikat wan we bae hemi rul, hem nao bae I olsem man blo lukaot ol man blong mi Israel.'" +======= +\v 4 Herod i karem evri Jif Pris mo ol tija blong Loa oli kam tugeta, nao i askem olgeta, " wea nao bae Kraes ya i bon?" \v 5 Oli talem long hem se, " long taon ia Betlehem, long Judea, hemia nao wanem we profet I bin raedemaot, ' \v 6 Be yu, taon blong Betlehem, long Juda, we ino smol olgeta long ol hae lida blong Juda, from long yu mbae wan rula +>>>>>>> 896319134279cbf353eb51508e71ea71b2f93025 diff --git a/02/title.txt b/02/title.txt index da8b34b..4bc192e 100644 --- a/02/title.txt +++ b/02/title.txt @@ -1 +1,5 @@ -Chapta 2 \ No newline at end of file +<<<<<<< HEAD +Chapta 2 +======= +Japta 2 +>>>>>>> 896319134279cbf353eb51508e71ea71b2f93025 diff --git a/LICENSE.md b/LICENSE.md index 0d1204e..8b59368 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,5 @@ +<<<<<<< HEAD <<<<<<< HEAD ## Creative Commons Attribution-ShareAlike 4.0 International @@ -39,6 +40,8 @@ http://creativecommons.org/licenses/by-sa/4.0/. This PDF was generated using Prince (https://www.princexml.com/). ======= +======= +>>>>>>> 896319134279cbf353eb51508e71ea71b2f93025 # License ## Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) @@ -65,4 +68,7 @@ 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. +<<<<<<< HEAD >>>>>>> d5e22b793d687503cc34fbabeabba29c28f9adb5 +======= +>>>>>>> 896319134279cbf353eb51508e71ea71b2f93025 diff --git a/front/title.txt b/front/title.txt new file mode 100644 index 0000000..8f0dbec --- /dev/null +++ b/front/title.txt @@ -0,0 +1 @@ +Matiu \ No newline at end of file diff --git a/manifest.json b/manifest.json index 3850b7b..6c193b4 100644 --- a/manifest.json +++ b/manifest.json @@ -36,7 +36,8 @@ "Arthur Wesur", "Arthurwesur", "Betty", - "Rebecca David" + "Rebecca David", + "Yen Max Nirambath" ], "finished_chunks": [ "03-01", @@ -45,9 +46,6 @@ "03-10", "03-13", "03-16", - "02-title", - "02-01", - "02-04", "02-07", "02-09", "02-11", @@ -55,6 +53,7 @@ "02-16", "02-17", "02-19", - "02-22" + "02-22", + "front-title" ] } \ No newline at end of file