From 2fabdec8f3e8a02a71b259a7268a118abe004008 Mon Sep 17 00:00:00 2001 From: Talo Date: Thu, 19 Jan 2023 18:43:19 +1100 Subject: [PATCH] Thu Jan 19 2023 18:43:18 GMT+1100 (Solomon Islands Time) --- 02/01.txt | 8 +------- 02/04.txt | 7 +------ 02/title.txt | 6 +----- manifest.json | 6 +++++- 4 files changed, 8 insertions(+), 19 deletions(-) diff --git a/02/01.txt b/02/01.txt index ad64ef8..b38076d 100644 --- a/02/01.txt +++ b/02/01.txt @@ -1,7 +1 @@ -<<<<<<< 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. -======= -\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 +\c 2 \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. \ No newline at end of file diff --git a/02/04.txt b/02/04.txt index bf8883a..6d15329 100644 --- a/02/04.txt +++ b/02/04.txt @@ -1,6 +1 @@ -<<<<<<< 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.'" -======= -\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 +\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 diff --git a/02/title.txt b/02/title.txt index 4bc192e..85e4d0b 100644 --- a/02/title.txt +++ b/02/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Chapta 2 -======= -Japta 2 ->>>>>>> 896319134279cbf353eb51508e71ea71b2f93025 +Japta 2 \ No newline at end of file diff --git a/manifest.json b/manifest.json index f4218b3..920bfce 100644 --- a/manifest.json +++ b/manifest.json @@ -37,10 +37,14 @@ "Arthurwesur", "Betty", "Rebecca David", - "Yen Max Nirambath" + "Yen Max Nirambath", + "Talo" ], "finished_chunks": [ "front-title", + "02-title", + "02-01", + "02-04", "02-07", "02-09", "02-11",