From 4c377dc024a352395d110754484d6d8b573b2bff Mon Sep 17 00:00:00 2001 From: Talo Date: Thu, 21 Sep 2023 16:28:48 +1100 Subject: [PATCH] Thu Sep 21 2023 16:28:48 GMT+1100 (Solomon Islands Time) --- 11/27.txt | 6 +----- 11/31.txt | 6 +----- 11/33.txt | 6 +----- manifest.json | 3 +++ 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/11/27.txt b/11/27.txt index 51820b6..71c8001 100644 --- a/11/27.txt +++ b/11/27.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 27 Spos we wan man i kakae bred mo dring long kap blong Masta be hemi no stret blong mekem olsem,hemi mekem sin agens long bodi mo blad blong Masta.\v 28 Fastaem, I gud blong man i jekemgud spos hat blong hem i stret o nogat,ale bihaen bae hemi save kakae bred mo dring long kap ia. \v 29 From we man we i kakae mo i dring be i no kasem save se bodi i minim wanem,bae hemi kasem jajmen. \v 30 From samting ya,plante long ufala oli slak ,oli sik mo sam oli ded from ufala no rispektem bodi blong M asta. -======= -\v 27 From samting ya, olgeta we bambai oli kaikai bread o drink lo cup blong Masta oli mas honarem God. Olgeta we oli no honarem wanem we bred mo cup i representem bambai oli harem nogud. \v 28 Yu mas lukluk gud laef blong yu festaem, mo bai yu save kaikai bred mo drink long cup ia. \v 29 Bai judgement i kasem olgeta we oli kaikai bred mo drink lo cup ia be oli no save se i stap minim wanem. \v 30 From samting ia fulap lo yufala oli stap wik mo sik, mo ded from oli no honarem bred mo cup ia. ->>>>>>> 61f38246df09e4c249c527686f05cbcf48316243 +\v 27 From samting ya, olgeta we bambai oli kaikai bread o drink lo cup blong Masta oli mas honarem God. Olgeta we oli no honarem wanem we bred mo cup i representem bambai oli harem nogud. \v 28 Yu mas lukluk gud laef blong yu festaem, mo bai yu save kaikai bred mo drink long cup ia. \v 29 Bai judgement i kasem olgeta we oli kaikai bred mo drink lo cup ia be oli no save se i stap minim wanem. \v 30 From samting ia fulap lo yufala oli stap wik mo sik, mo ded from oli no honarem bred mo cup ia. \ No newline at end of file diff --git a/11/31.txt b/11/31.txt index aee0741..7d0dfbe 100644 --- a/11/31.txt +++ b/11/31.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 31 Sipos yumi luksave se yumi wanem kaen man bifo yumi tekem bodi mo blad blong Masta, bae God i nosave jajem yumi. \v 32 Be taem Masta i jajem yumi mo panisim yumi,hemi mekem olsem blong stretem yumi,blong yumi nosave kasem panis wetem wol ya. -======= -\v 31 Be spos yumi lukluk gud laef blong yumi, bai yumi no kasem judegment ia. \v 32 Be taem we Masta i judegem yumi, i stap trenem yumi, blong no stap lo fasin blong wol. ->>>>>>> 61f38246df09e4c249c527686f05cbcf48316243 +\v 31 Be spos yumi lukluk gud laef blong yumi, bai yumi no kasem judegment ia. \v 32 Be taem we Masta i judegem yumi, i stap trenem yumi, blong no stap lo fasin blong wol. \ No newline at end of file diff --git a/11/33.txt b/11/33.txt index 583b9b5..a5698b2 100644 --- a/11/33.txt +++ b/11/33.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 33 Ol brata mo sista,taem yufala kam wanples from kakae blong Masta,yufala mas wet kasem evriwan i kam. \v 34 Spos wan long yufala i hangri,i gud hemi kakae fastaem long haos blong hem,nao taem yufala i kam wanples,God i nosave panisim yufala from fasin blong yufala.Ol narafala samting we yufala i askem,taem bae mi kam bae mi jes kliarem long yufala. -======= -\v 33 From samting ia, ol brata blong mi, everiwan long yufala i mas stap bifo yufala i kaikai. \v 34 Spos wan lo yufala i hungry letem hem i kaikai lo house bifo i kam, from taem yufala i kam bai hemi no wan judgement. Mo olgeta narafala samting we yufala i raetem, taem mi kam bae mi kivim ol intraksen. ->>>>>>> 61f38246df09e4c249c527686f05cbcf48316243 +\v 33 From samting ia, ol brata blong mi, everiwan long yufala i mas stap bifo yufala i kaikai. \v 34 Spos wan lo yufala i hungry letem hem i kaikai lo house bifo i kam, from taem yufala i kam bai hemi no wan judgement. Mo olgeta narafala samting we yufala i raetem, taem mi kam bae mi kivim ol intraksen. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 855ec95..28e949f 100644 --- a/manifest.json +++ b/manifest.json @@ -97,6 +97,9 @@ "11-20", "11-23", "11-25", + "11-27", + "11-31", + "11-33", "12-title", "12-01", "12-04",