From 7a232cce35c11d3a7d4f7b8a92e3aca21e9e00c8 Mon Sep 17 00:00:00 2001 From: "bahasatech.indotimur" Date: Mon, 5 Dec 2022 17:39:46 +0700 Subject: [PATCH] Mon Dec 05 2022 17:39:45 GMT+0700 (Western Indonesia Time) --- 05/12.txt | 6 +----- 06/01.txt | 6 +----- 06/11.txt | 6 +----- 07/01.txt | 6 +----- 07/13.txt | 6 +----- 07/15.txt | 6 +----- 07/20.txt | 6 +----- manifest.json | 6 ++++++ 8 files changed, 13 insertions(+), 35 deletions(-) diff --git a/05/12.txt b/05/12.txt index 73edc7b..1b88ad4 100644 --- a/05/12.txt +++ b/05/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 13 \v 14 \v 12 Nepelre menaya we sani-sani tena dumbo be ye, detelro si lati mende we te a te mende klrimnemlre walri yeko mbei-mbei A Sena Walri Ne meropukona. We pekong te anembe, sa telre tna yanipainya. Detelro sena tena mane dumbombe Walri a te nimeyembe, ne manimba yei nuwei. Sa alrema detelro delre anenaiye, ne teu bulru menta nepe te simbelraimbeko na detelro ye sa alrma te anenaye. -======= -\v 12 Nepelre menaya we sani-sani tena dumbo be ye, detelro si lati mende we te a te mende klrimnemlre walri yeko mbei-mbei A Sena Walri Ne meropukona. We pekong te anembe, sa telre tna yanipainya. Detelro sena tena mane dumbombe Walri a te nimeyembe, ne manimba yei nuwei. Sa alrema detelro delre anenaiye, ne teu bulru menta nepe te simbelraimbeko na detelro ye sa alrma te anenaye. \v 13 \v 14 ->>>>>>> 8ad77a117b69d32634d35be5bc23842fc655576b +\v 13 \v 14 \v 12 Nepelre menaya we sani-sani tena dumbo be ye, detelro si lati mende we te a te mende klrimnemlre walri yeko mbei-mbei A Sena Walri Ne meropukona. We pekong te anembe, sa telre tna yanipainya. Detelro sena tena mane dumbombe Walri a te nimeyembe, ne manimba yei nuwei. Sa alrema detelro delre anenaiye, ne teu bulru menta nepe te simbelraimbeko na detelro ye sa alrma te anenaye. \ No newline at end of file diff --git a/06/01.txt b/06/01.txt index e71721a..14060d0 100644 --- a/06/01.txt +++ b/06/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 6 \v 3 \v 1 Netenate, membe Kristus kena a'tong klriyoumena pertobatan pelre perbuatan tete tena pelre nepelre tlreplre ALLAH kote; \v 2 mlro-mlro sukunaimelrna [bu te klronaimelrna] pelre me palre tena pelre kilriyaime; nenaa tenate ALLAH seso te tupumbondena eye mekomalre. -======= -\c 6 \v 1 Netenate, membe Kristus kena a'tong klriyoumena pertobatan pelre perbuatan tete tena pelre nepelre tlreplre ALLAH kote; \v 2 mlro-mlro sukunaimelrna [bu te klronaimelrna] pelre me palre tena pelre kilriyaime; nenaa tenate ALLAH seso te tupumbondena eye mekomalre. \v 3 ->>>>>>> 8ad77a117b69d32634d35be5bc23842fc655576b +\c 6 \v 3 \v 1 Netenate, membe Kristus kena a'tong klriyoumena pertobatan pelre perbuatan tete tena pelre nepelre tlreplre ALLAH kote; \v 2 mlro-mlro sukunaimelrna [bu te klronaimelrna] pelre me palre tena pelre kilriyaime; nenaa tenate ALLAH seso te tupumbondena eye mekomalre. \ No newline at end of file diff --git a/06/11.txt b/06/11.txt index 39cc7a6..fa8e1cf 100644 --- a/06/11.txt +++ b/06/11.txt @@ -1,6 +1,2 @@ -<<<<<<< HEAD \v 11 De metelre kena tedelrenene we kilri yauna ketekunan neyaumo netenate jaminan pengharapan doukena noutelrna neme ende tute yambonde, \v 12 nenatena we dimaiy-dimaiy tna dilripainya, nenate janji-janji ALLAH detlro yatiyinane yeko walrolre tawembe iman plre ketekunan dowembe. -======= -\v 11 De metelre kena tedelrenene we kilri yauna ketekunan neyaumo netenate jaminan pengharapan doukena noutelrna neme ende tute yambonde, \v 12 nenatena we dimaiy-dimaiy tna dilripainya, nenate janji-janji ALLAH detlro yatiyinane yeko walrolre tawembe iman plre ketekunan dowembe. -(Allah Kena Janji Busimena Olripay) ->>>>>>> 8ad77a117b69d32634d35be5bc23842fc655576b +(Allah Kena Janji Busimena Olripay) \ No newline at end of file diff --git a/07/01.txt b/07/01.txt index b77eea2..1c35449 100644 --- a/07/01.txt +++ b/07/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 7 \v 1 Nemane delrati, Melkisedek, Andewapi salem neplre Imam Mang Walri yalre doplre, Abraham te tupe yekenelre nedai nape Abraham date pelranelrolre andowapi - andowapi plre pelrate eke dilriyane, neplre Apoite sanembuko. \v 2 Melkisedek te, Abraham netesasasi pelranelrolre atiyainate mebe selre ate kenelre, memetelretena Melkisedek nena eudo, “Andewapi noutelrena”, nemane, “Andewapi Salem” eudo sinape “andewapi kena sate beyewena”. \v 3 Ne nekeyowena nenang plre nemang plre ambai, nenna selrai ambai, neplrena nena yelreu tulru meyowe tutena ambai, nemane, Mang Walri nuwei mane ne imam mane nemane mote nekende mende. -======= -\c 7 ( Imam Melkizedek ) \v 1 Nemane delrati, Melkisedek, Andewapi salem neplre Imam Mang Walri yalre doplre, Abraham te tupe yekenelre nedai nape Abraham date pelranelrolre andowapi - andowapi plre pelrate eke dilriyane, neplre Apoite sanembuko. \v 2 Melkisedek te, Abraham netesasasi pelranelrolre atiyainate mebe selre ate kenelre, memetelretena Melkisedek nena eudo, “Andewapi noutelrena”, nemane, “Andewapi Salem” eudo sinape “andewapi kena sate beyewena”. \v 3 Ne nekeyowena nenang plre nemang plre ambai, nenna selrai ambai, neplrena nena yelreu tulru meyowe tutena ambai, nemane, Mang Walri nuwei mane ne imam mane nemane mote nekende mende. ->>>>>>> 8ad77a117b69d32634d35be5bc23842fc655576b +\c 7 ( Imam Melkizedek ) \v 1 Nemane delrati, Melkisedek, Andewapi salem neplre Imam Mang Walri yalre doplre, Abraham te tupe yekenelre nedai nape Abraham date pelranelrolre andowapi - andowapi plre pelrate eke dilriyane, neplre Apoite sanembuko. \v 2 Melkisedek te, Abraham netesasasi pelranelrolre atiyainate mebe selre ate kenelre, memetelretena Melkisedek nena eudo, “Andewapi noutelrena”, nemane, “Andewapi Salem” eudo sinape “andewapi kena sate beyewena”. \v 3 Ne nekeyowena nenang plre nemang plre ambai, nenna selrai ambai, neplrena nena yelreu tulru meyowe tutena ambai, nemane, Mang Walri nuwei mane ne imam mane nemane mote nekende mende. \ No newline at end of file diff --git a/07/13.txt b/07/13.txt index ed3d271..41c6d01 100644 --- a/07/13.txt +++ b/07/13.txt @@ -1,6 +1,2 @@ -<<<<<<< HEAD \v 13 Da detelro elrandena ne selrai silrina, nepelrena, nena selrailrena belrengka mena ambai. \v 14 Nemane, nepe nimeyanenbuko ena Walri Yei Ne Yahudi kena tou lrena, datou Musa netena imam-imam kena atena sanipai. -======= -\v 13 Da detelro elrandena ne selrai silrina, nepelrena, nena selrailrena belrengka mena ambai. \v 14 Nemane, nepe nimeyanenbuko ena Walri Yei Ne Yahudi kena tou lrena, datou Musa netena imam-imam kena atena sanipai. -(Walri Yei Imam Melkisedek Mane) ->>>>>>> 8ad77a117b69d32634d35be5bc23842fc655576b +(Walri Yei Imam Melkisedek Mane) \ No newline at end of file diff --git a/07/15.txt b/07/15.txt index e46bbc2..5d22c81 100644 --- a/07/15.txt +++ b/07/15.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -(Walri Yei Imam Melkisedek Mane) \v 15 Metelrena da a nepe kiya telre nepelrena e tande detelro bei manipana, nemane ne imam Melkisedek mane. \v 16 Imam te ulrunayena nena detelro kena mendo ambai, nena kepelre engkengpe Walri sena mote. \v 17 Netenate a kulra nepe walreyowe, we nekewena imam nese mote, Melkisedek kena a melropukona mane. -======= -\v 15 Metelrena da a nepe kiya telre nepelrena e tande detelro bei manipana, nemane ne imam Melkisedek mane. \v 16 Imam te ulrunayena nena detelro kena mendo ambai, nena kepelre engkengpe Walri sena mote. \v 17 Netenate a kulra nepe walreyowe, we nekewena imam nese mote, Melkisedek kena a melropukona mane. ->>>>>>> 8ad77a117b69d32634d35be5bc23842fc655576b +\v 15 Metelrena da a nepe kiya telre nepelrena e tande detelro bei manipana, nemane ne imam Melkisedek mane. \v 16 Imam te ulrunayena nena detelro kena mendo ambai, nena kepelre engkengpe Walri sena mote. \v 17 Netenate a kulra nepe walreyowe, we nekewena imam nese mote, Melkisedek kena a melropukona mane. \ No newline at end of file diff --git a/07/20.txt b/07/20.txt index fe9be9d..38f8057 100644 --- a/07/20.txt +++ b/07/20.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 20 Nepelrena a kiyaipai a date elripai telrepelre ne ate saukaye imam te olraipeko. \v 21 Nemane, ne imam te elrupuko detelro nete sanenbukona abulrane, “Mang Walri ate sasuke nepelre ne kenatena tuwaipai: ‘We imam ne sena motena.’” -======= -\v 20 Nepelrena a kiyaipai a date elripai telrepelre ne ate saukaye imam te olraipeko. \v 21 Nemane, ne imam te elrupuko detelro nete sanenbukona abulrane, “Mang Walri ate sasuke nepelre ne kenatena tuwaipai: ‘We imam ne sena motena.’” Nepelrena da a bulrane, Walri Yei a yeko lrema dopelrena. ->>>>>>> 8ad77a117b69d32634d35be5bc23842fc655576b +\v 20 Nepelrena a kiyaipai a date elripai telrepelre ne ate saukaye imam te olraipeko. \v 21 Nemane, ne imam te elrupuko detelro nete sanenbukona abulrane, “Mang Walri ate sasuke nepelre ne kenatena tuwaipai: ‘We imam ne sena motena.’” Nepelrena da a bulrane, Walri Yei a yeko lrema dopelrena. \ No newline at end of file diff --git a/manifest.json b/manifest.json index fd4bfd1..db748bd 100644 --- a/manifest.json +++ b/manifest.json @@ -50,17 +50,23 @@ "05-06", "05-07", "05-09", + "05-12", "06-title", + "06-01", "06-04", "06-07", "06-09", + "06-11", "06-13", "06-16", "06-19", "07-title", + "07-01", "07-04", "07-07", "07-11", + "07-13", + "07-15", "07-18", "07-22", "07-25",