From e3e533db0a17439bbec65f9bd3a048ae29b75b9b Mon Sep 17 00:00:00 2001 From: gibson Date: Tue, 25 Aug 2020 22:12:00 -0300 Subject: [PATCH] Tue Aug 25 2020 22:11:59 GMT-0300 (E. South America Standard Time) --- 22/21.txt | 6 +----- 22/24.txt | 6 +----- 22/28.txt | 6 +----- 22/31.txt | 6 +----- 22/38.txt | 6 +----- 22/41.txt | 6 +----- 23/01.txt | 6 +----- manifest.json | 14 ++++++++++++++ 8 files changed, 21 insertions(+), 35 deletions(-) diff --git a/22/21.txt b/22/21.txt index e612201..687c3a7 100644 --- a/22/21.txt +++ b/22/21.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 21 Long moning taim Balam i kirap na stretim donki bilong en na i go wantaim ol hetman bilong Moab. \v 22 Tasol dispela wokabaut bilong en i kirapim belhat long God Yawe. Balam i go long donki bilong em, na ensel bilong God i sanap namel long rot olsem birua bilong bagarapim Balam. Tupela wokman bilong Balam tu i go wantaim em. \v 23 Donki bilong Balam i lukim ensel bilong God Yawe i sanap long rot wantaim bainat long han bilong en. Orait donki i lusim rot na i go insait long wanpela gaden wain. Balam i paitim em long stik bilong putim em i kam bek long rot. -======= -\v 21 Em i bin lukim olsem ino gat hatwok long Jekop o hevi insait long ol Israel. God Yawe bilong ol i stap wantaim ol na singaut long king namel long ol. \v 22 God Yawe i bringim ol i kam aut long Isip olsem strong bilong wel bulmakau. ->>>>>>> c0c6854127c1fa4e3082c54b5d38f421a081e9d3 +\v 21 Em i bin lukim olsem ino gat hatwok long Jekop o hevi insait long ol Israel. God Yawe bilong ol i stap wantaim ol na singaut long king namel long ol. \v 22 God Yawe i bringim ol i kam aut long Isip olsem strong bilong wel bulmakau. \ No newline at end of file diff --git a/22/24.txt b/22/24.txt index aee864e..f65e367 100644 --- a/22/24.txt +++ b/22/24.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 24 Ensel bilong God Yawe i sanap long rot namel long sampela gaden wain, em i sanap long hap we tupela ston banis i stap long han kais na hansut i pasim na mekim rot i go liklik long en. \v 25 Taim donki i lukim ensel bilong God Yawe gen, em i go pas long ston banis na i pasim lek bilong Balam long ston banis, na Balam i paitim donki bilong em long stik gen. -======= -\v 24 Lukim, ol manmeri i kirap olsem ol laion, olsem laion i ting long pait. Em i no inap sindaun inap em i kaikai wanem em i ting long en na drin blut bilong wanem em i bin kilim.'' ->>>>>>> c0c6854127c1fa4e3082c54b5d38f421a081e9d3 +\v 24 Lukim, ol manmeri i kirap olsem ol laion, olsem laion i ting long pait. Em i no inap sindaun inap em i kaikai wanem em i ting long en na drin blut bilong wanem em i bin kilim.'' \ No newline at end of file diff --git a/22/28.txt b/22/28.txt index c47d049..ac25dcf 100644 --- a/22/28.txt +++ b/22/28.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 28 Orait God Yawe i opim maus bilong dispela donki na em i tok long Balam, "Mi mekim wanem samting tru bilong mekim yu belhat na yu paitim mi tripela taim long stik?" \v 29 Balam i bekim tok bilong donki olsem, "Mi paitim yu, long wanem yu mekim longlong pasin long mi. Sapos mi bin holim bainat long han, nau mi inap kilim yu pinis." \v 30 Donki i bekim tok bilong Balam olsem, "Ating mi no dispela donki yu save sindaun na wokabaut long en olgeta taim long laip bilong yu i kam inap nau? O mi save mekim dispela kain pasin long yu tu bipo a?" Balam i tok ,"Nogat." -======= -\v 28 Olsem na Balak i kisim Balam i go antap long het bilong maunten Peo, inap em i lukluk i go daun long ples drai. \v 29 Balam i tokim Balak, "Wokim 7-pela alta bilong mi hia na redim 7-pela bulmakau na 7-pela meme." \v 30 Orait Balak i mekim olsem Balam i bin tok, em i mekim ofa long bulmakau na meme long wanwan alta. ->>>>>>> c0c6854127c1fa4e3082c54b5d38f421a081e9d3 +\v 28 Olsem na Balak i kisim Balam i go antap long het bilong maunten Peo, inap em i lukluk i go daun long ples drai. \v 29 Balam i tokim Balak, "Wokim 7-pela alta bilong mi hia na redim 7-pela bulmakau na 7-pela meme." \v 30 Orait Balak i mekim olsem Balam i bin tok, em i mekim ofa long bulmakau na meme long wanwan alta. \ No newline at end of file diff --git a/22/31.txt b/22/31.txt index 2daac8b..aacecac 100644 --- a/22/31.txt +++ b/22/31.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 31 Bihain God Yawe i opim ai bilong Balam na em i lukim ensel bilong God Yawe i sanap long rot wantaim bainat long han bilong en. Orait Balam i daunim het na putim pes i go daun tru long graun na i stap. \v 32 Orait ensel bilong God Yawe i tokim em, "Bilong wanem yu paitim donki bilong yu tripela taim? Mi kam long yu olsem birua bilong bagarapim yu, long wanem pasin bilong yu i no stret long ai bilong mi. \v 33 Donki i lukim mi na tanim i go arere tripela taim, sapos donki i no bin tanim i go arere, mi inap kilim yu pinis na larim donki i go." -======= -\v 31 Bihain God Yawe i opim ai bilong Balam na em i lukim ensel bilong God Yawe i sanap long rot wantaim bainat long han bilong en. Orait Balam i daunim het na putim pes i go daun tru long graun na i stap. \v 32 Orait ensel bilong God Yawe i tokim em, "Bilong wanem yu paitim donki bilong yu tripela taim? Mi kam long yu olsem birua bilong bagarapim yu, long wanem pasin bilong yu ino stret long ai bilong mi. \v 33 Donki i lukim mi na tanim i go arere tripela taim, sapos donki ino bin tanim i go arere, mi inap kilim yu pinis na larim donki i go." ->>>>>>> c0c6854127c1fa4e3082c54b5d38f421a081e9d3 +\v 31 Bihain God Yawe i opim ai bilong Balam na em i lukim ensel bilong God Yawe i sanap long rot wantaim bainat long han bilong en. Orait Balam i daunim het na putim pes i go daun tru long graun na i stap. \v 32 Orait ensel bilong God Yawe i tokim em, "Bilong wanem yu paitim donki bilong yu tripela taim? Mi kam long yu olsem birua bilong bagarapim yu, long wanem pasin bilong yu ino stret long ai bilong mi. \v 33 Donki i lukim mi na tanim i go arere tripela taim, sapos donki ino bin tanim i go arere, mi inap kilim yu pinis na larim donki i go." \ No newline at end of file diff --git a/22/38.txt b/22/38.txt index 9afc54c..12dfc88 100644 --- a/22/38.txt +++ b/22/38.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 38 Balam i bekim tok bilong Balak, "Mi kam pinis long yu , tasol mi no inap toktok long laik bilong mi yet. God Yawe bai i givim mi olgeta toktok long mekim." \v 39 Orait Balak i kisim Balam na tupela i go kamap long Kiriat Husot. \v 40 Orait Balak i kilim bulmakau na mekim ofa na em i givim sampela mit long Balam na ol hetman i stap wantaim em. -======= -\v 38 Balam i bekim tok bilong Balak, "Mi kam pinis long yu , tasol mi no inap toktok long laik bilong mi yet. God Yawe bai i givim mi olgeta toktok long mekim." \v 39 Orait Balak i kisim Balam na tupela i go kamap long Kiriat Husait. \v 40 Orait Balak i kilim bulmakau na mekim ofa na em i givim sampela mit long Balam na ol hetman i stap wantaim em. ->>>>>>> c0c6854127c1fa4e3082c54b5d38f421a081e9d3 +\v 38 Balam i bekim tok bilong Balak, "Mi kam pinis long yu , tasol mi no inap toktok long laik bilong mi yet. God Yawe bai i givim mi olgeta toktok long mekim." \v 39 Orait Balak i kisim Balam na tupela i go kamap long Kiriat Husait. \v 40 Orait Balak i kilim bulmakau na mekim ofa na em i givim sampela mit long Balam na ol hetman i stap wantaim em. \ No newline at end of file diff --git a/22/41.txt b/22/41.txt index 0be038d..e3141c9 100644 --- a/22/41.txt +++ b/22/41.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 41 Na long moning taim Balak i kisim Balam i go antap long mauten bilong god giaman Bal. Long dispela hap em inap lukim liklik hap lain tasol bilong Israel i stap long kem bilong ol. -======= -\v 41 Na long moning taim Balak i kisim Balam i go antap long mauten bilong giaman god Bal. Long dispela hap em inap lukim liklik hap lain tasol bilong Israel i stap long kem bilong ol. ->>>>>>> c0c6854127c1fa4e3082c54b5d38f421a081e9d3 +\v 41 Na long moning taim Balak i kisim Balam i go antap long mauten bilong giaman god Bal. Long dispela hap em inap lukim liklik hap lain tasol bilong Israel i stap long kem bilong ol. \ No newline at end of file diff --git a/23/01.txt b/23/01.txt index ac763c1..749b7bf 100644 --- a/23/01.txt +++ b/23/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 1 Balam i tokim Balak,"Wokim 7-pela alta bilong mi long hia na redim 7-pela bulmakau na 7-pela meme." \v 2 Orait Balam i mekim olsem Balak i tokim em. Bihain Balak na Balam i ofarim ol bulmakau na ol meme antap long olgeta alta. \v 3 Na Balam i tokim Balak, "Sanap long ofa paia bilong yu na mi bai go. Ating God Yawe bai i kam bungim mi. Wanem em i soim mi bai mi tokim yu. ''Orait na em i go long het bilong maunten ino gat diwai long en." -======= -\c 23 \v 1 Taim Balam i lukim olsem God Yawe i amamas long blesim Israel, em i no go olsem sampela taim, long mekim posin. Nogat em i lukluk i go long ples nating. ->>>>>>> c0c6854127c1fa4e3082c54b5d38f421a081e9d3 +\c 23 \v 1 Taim Balam i lukim olsem God Yawe i amamas long blesim Israel, em i no go olsem sampela taim, long mekim posin. Nogat em i lukluk i go long ples nating. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 6d97063..b19763b 100644 --- a/manifest.json +++ b/manifest.json @@ -393,18 +393,32 @@ "22-09", "22-12", "22-15", + "22-18", + "22-21", + "22-24", "22-26", + "22-28", + "22-31", "22-34", "22-36", + "22-38", + "22-41", + "22-01", "22-04", + "22-07", + "22-09", "22-10", "22-11", "22-13", "22-16", "22-19", + "22-21", "22-23", + "22-24", "22-25", + "22-28", "23-title", + "23-01", "23-02", "23-06", "23-08",