From d0f3cb2b46c8efad84a0c6830a8e5908629448ee Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Mon, 1 Jan 2024 22:47:05 +1100 Subject: [PATCH] Mon Jan 01 2024 22:47:05 GMT+1100 (Solomon Islands Time) --- 05/36.txt | 6 +----- 05/38.txt | 6 +----- 05/40.txt | 6 +----- manifest.json | 3 +++ 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/05/36.txt b/05/36.txt index ebbd9f95..828acf5a 100644 --- a/05/36.txt +++ b/05/36.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 36 Saka kon ka Pathom tevian ngok koto kole kop kene wu bipio monok te wu miermier. \v 37 Ngok na kom tam ane, te kop tam ane, ngok na ko tung tungo te tung tungo, ta tasua mate me tito mi se temiar. -======= -\v 36 Saka kon ka pathom tevian ngok koto kole kop kene wu bipio monok te wu miermirer .\v 37 Ngo na kom tam ane te kop tamane ngo na ko tung tungo te tung tungo ta tusua nate metito mi se temiar. ->>>>>>> df453db6e017e56f6af4df8c543a9832d2e5e177 +\v 36 Saka kon ka Pathom tevian ngok koto kole kop kene wu bipio monok te wu miermier. \v 37 Ngok na kom tam ane, te kop tam ane, ngok na ko tung tungo te tung tungo, ta tasua mate me tito mi se temiar. \ No newline at end of file diff --git a/05/38.txt b/05/38.txt index 9594f2ee..e8177584 100644 --- a/05/38.txt +++ b/05/38.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 38 "Nam ka mene ngok ka vianten tusua na te mawane matam sianan mene luwum,' te vianten ente mon ka yap mawane matan mene iuwan.' \v 39 Nam ka mene ngok, vianten tusua, kate ngene wo sanga ne ngok so kon senge liline, ka tusua te evia niom tevesie, tam ane wo yap tase tevesie." -======= -\v 38 Nam kamene ngok ka vianten tusua na te mawane matamsianan mene luwum te vianten ente mon ka yap mawane matan mene luwon. \v 39 Nam ka mene ngok vianten tusua kate ngene wo sanga ne ngok sokon senge liline ka tusua te evia niom tevesie tam ane wo yap tase tevesie . ->>>>>>> df453db6e017e56f6af4df8c543a9832d2e5e177 +\v 38 "Nam ka mene ngok ka vianten tusua na te mawane matam sianan mene luwum,' te vianten ente mon ka yap mawane matan mene iuwan.' \v 39 Nam ka mene ngok, vianten tusua, kate ngene wo sanga ne ngok so kon senge liline, ka tusua te evia niom tevesie, tam ane wo yap tase tevesie." \ No newline at end of file diff --git a/05/40.txt b/05/40.txt index f0123f18..947c5fd8 100644 --- a/05/40.txt +++ b/05/40.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 40 Vianten tusua na tilie ngok vian yen tas, kate ka ka kop sengene sam sesear mene te sio kuwu te senge. \v 41 Tusua na ti silia ngok kovian mail swa, tevian yam tabiam teviam. \v 42 Vianten tusua nate usi. Sie tusua mene ngok kop sengene me ne nge, tusua nata ka kopusi ane nge sie tusua, go mas usi ane nge. -======= -\v 42 \v 40 vianten tusua na tilie ngok vian yen tas kate ka kop sengenesam sesear mene te siokuwu te senge. \v 41 tusua na ti silia ngok kovian mail swa tevian yam tabiam tevian. ->>>>>>> df453db6e017e56f6af4df8c543a9832d2e5e177 +\v 40 Vianten tusua na tilie ngok vian yen tas, kate ka ka kop sengene sam sesear mene te sio kuwu te senge. \v 41 Tusua na ti silia ngok kovian mail swa, tevian yam tabiam teviam. \v 42 Vianten tusua nate usi. Sie tusua mene ngok kop sengene me ne nge, tusua nata ka kopusi ane nge sie tusua, go mas usi ane nge. \ No newline at end of file diff --git a/manifest.json b/manifest.json index c7871d54..db619aff 100644 --- a/manifest.json +++ b/manifest.json @@ -76,6 +76,9 @@ "05-27", "05-29", "05-31", + "05-36", + "05-38", + "05-40", "05-43", "05-46", "07-21",