Tue Jul 25 2023 14:31:58 GMT+1000 (Papua New Guinea Time)

03/04.txt

@@ -1,6 +1 @@
-<<<<<<< HEAD
-\v 4 Ioane ogonave ramu kamela homoka renu au vadakahe ge auki au negotanehe bodivi, renu au demake ramu isoiso mati ura idi tahaka. \v 5 Gerege Ierusalema seni renu Iudea inuhati koitava iabaraki au ḡasina otege, mati Ioridana iaro hakira oḡo ḡahava inuhati. \v 6 Iauki iau daureve ḡaḡae rogei, auki Ioridana tinavai babatiso ḡahi gevege.
-=======
-4 Ioane ogonave ramu kamela homoka ge auki kiege renu vadaka ge auki au negotane bodivi vanu. Au demaka ramu iso iso mati umuko idi. 
-5 Gerege koita iabaraki Ierusalema seni renu Iudea uhura au ḡasina otege, mati Ioridana iaro hakira oḡo ḡahava ia, 6 eige auki babatiso ḡahigei Ioridana iarova iau daureve rogei keto gevege.
->>>>>>> 1845f90f5c9ff6bc9774bd464cef41f09ad6831f
+\v 4 Ioane ogonave ramu kamela homoka renu au vadakahe ge auki au negotanehe bodivi, renu au demake ramu isoiso mati ura idi tahaka. \v 5 Gerege Ierusalema seni renu Iudea inuhati koitava iabaraki au ḡasina otege, mati Ioridana iaro hakira oḡo ḡahava inuhati. \v 6 Iauki iau daureve ḡaḡae rogei, auki Ioridana tinavai babatiso ḡahi gevege.

03/07.txt

@@ -1,7 +1 @@
-<<<<<<< HEAD
-\v 7 Eduge auki Faresia mati Sadukea ḡaha dadaḡa iabaraki au ḡasina babatiso oroḡonu, auki boriti ḡahi gevenu, “Inuhu ḡamika ma ḡahanu! Unuhuna roma iaka so Dirava hedokehe siviḡoro raḡohisa? \v 8 Oti me maḡe be kiogeisa eraki ia maḡuri maḡe mane ḡaḡae kisa. \v 9 Ia negu rome iaka ḡuma daure vara ia ḡare gevenu, ‘Noka Aberahamo raki ni tene’; iakera daki ia kirogeima, Dirava ra riaḡahe muni o idi gevare Aberahamo vahiruhe kiogei gevara.
-=======
-7 Eduge auki Faresia mati Sadukea ḡahava au ḡasina babatiso oroḡonu, auki kiro gevege, “Inuhu ḡamika ma ḡahanu! Unuhuna roma iaka Dirava hedokehe siviḡoro raḡohisa? 
-8 Oti me maḡe be kiogeisa eramu ia maḡuri maḡe mane ḡaḡae kisa. 
-9 Ia negu rome iaka ḡuma daure vara ia ḡare gevenu, Noka Aberahamo ramu ni tene; iakera daki ia kirogeima, Dirava vara riaḡahe muni o idigei Aberahamo vahiruhe kiogei gevara
->>>>>>> 1845f90f5c9ff6bc9774bd464cef41f09ad6831f
+\v 7 Eduge auki Faresia mati Sadukea ḡaha dadaḡa iabaraki au ḡasina babatiso oroḡonu, auki boriti ḡahi gevenu, “Inuhu ḡamika ma ḡahanu! Unuhuna roma iaka so Dirava hedokehe siviḡoro raḡohisa? \v 8 Oti me maḡe be kiogeisa eraki ia maḡuri maḡe mane ḡaḡae kisa. \v 9 Ia negu rome iaka ḡuma daure vara ia ḡare gevenu, ‘Noka Aberahamo raki ni tene’; iakera daki ia kirogeima, Dirava ra riaḡahe muni o idi gevare Aberahamo vahiruhe kiogei gevara.

03/10.txt

@@ -1,7 +1 @@
-<<<<<<< HEAD
-\v 10 Negu tage ḡuma ra baobao vera; eige idi inuhati madika kiki veite iama iau umukehe dodo gevare idigei vene uhura kira geisa. \v 11 “Daka eiava ge daki ia babatiso ḡahigeima iai ḡuma daureve ḡare gevene dainehe, eduge di itahe oroḡare au hedoke ramu raho ketake; renu daka au vaḡotoni maḡe veite au vasi iaḡane agohisa. Auka Horu Aena mati hedo ruta ge auna a babatiso ḡahisa. \v 12 Au koni kasai me ḡahare gini vara au adehe, eige auna koni kasagei maḡeva genegei idigei ḡosiḡare iagahe reḡui ḡosigeisa; eduge koni momono daureva iabera auna idigei vene raḡi behi behive uhura kira geisa.
-=======
-\v 10 \v 11 \v 12 10 Ḡuma ra bao bao vera aka idi umukahe dodo geisa; idi inuhati iau madika maḡe kiki veite era iaka dodovare mi vene uhura kiraki vara. 
-11 “Daka eiava ge daki koita babatiso ḡahi gevenu, iau daureve ḡare gevare gahavaia. Eduge koita be di itahe oroḡare au hedoke ra raho ketake; eige daka au vaḡotoni maḡe veite renu ḡereḡere veite au vasi iaḡane agohisa. Auka Horu Aena mati hedo ruta gera auna ia babatiso ḡahigeisa. 
-12 Auka riaḡahe koita maḡe kasagei daure ḡaha iau, erehuta negu ḡeḡe kiki koita naḡate, au me kiare auriva miare au demaka iaka maḡe kasai daureva iau. Gerege ḡeḡe kiki koita vana maḡeva idigei au demaka reḡui bougevare iagahe ḡosiḡei, eduge daureve iabara auka idigei vene raḡare uhura kira geige vara.”
->>>>>>> 1845f90f5c9ff6bc9774bd464cef41f09ad6831f
+\v 10 Negu tage ḡuma ra baobao vera; eige idi inuhati madika kiki veite iama iau umukehe dodo gevare idigei vene uhura kira geisa. \v 11 “Daka eiava ge daki ia babatiso ḡahigeima iai ḡuma daureve ḡare gevene dainehe, eduge di itahe oroḡare au hedoke ramu raho ketake; renu daka au vaḡotoni maḡe veite au vasi iaḡane agohisa. Auka Horu Aena mati hedo ruta ge auna a babatiso ḡahisa. \v 12 Au koni kasai me ḡahare gini vara au adehe, eige auna koni kasagei maḡeva genegei idigei ḡosiḡare iagahe reḡui ḡosigeisa; eduge koni momono daureva iabera auna idigei vene raḡi behi behive uhura kira geisa.

03/13.txt

@@ -1,6 +1 @@
-<<<<<<< HEAD
-\v 13 Gerege Iesu raki Galileia seni oroḡime auki Ioane ḡasina Ioridana otinu, auka babatiso ḡahisa. \v 14 Eduge Ioane raki imiḡi onaki ronu, “Akena bu da babatiso ḡahisa, esemena a di ḡasina oroḡi roma daka a babatiso ḡahisa?” \v 15 Eduge Iesu raki kironu, “Da roiare so negubutu kisa; ḡuma ora Dirava urave roiare nona kisa.” Gerege Ioane raki Iesu gare meva kinu.
-=======
-13 Gerege Iesu raki Galileia seni urimi Ioane ḡasina Ioridana otinu, Ioane so babatiso ḡahisa. 14 Eduge Ioane raki imiḡi, roege, “Akena da babatiso ḡahisa, esemena a di ḡasina oroḡi roma daka a babatiso ḡahisa?” 
-15 Iesu raki kironu, “Da roiare so negubutu kisa. Ḡuma onaki ora noka Dirava roiare inuhati riaḡa ḡahisa.” Gerege Ioane raki itonu.
->>>>>>> 1845f90f5c9ff6bc9774bd464cef41f09ad6831f
+\v 13 Gerege Iesu raki Galileia seni oroḡime auki Ioane ḡasina Ioridana otinu, auka babatiso ḡahisa. \v 14 Eduge Ioane raki imiḡi onaki ronu, “Akena bu da babatiso ḡahisa, esemena a di ḡasina oroḡi roma daka a babatiso ḡahisa?” \v 15 Eduge Iesu raki kironu, “Da roiare so negubutu kisa; ḡuma ora Dirava urave roiare nona kisa.” Gerege Ioane raki Iesu gare meva kinu.

03/16.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 16 Eige auka Iesu babatiso ḡahanu, auki eiava seni hakivanu, tutube viege va uduava raki baoraḡi, auki Dirava Horuve eraḡege auki vava seni uguhi erehuta uguha naḡate au abage au variada. \v 17 Gerege eno be raki vava seni uguhi onaki ronu, “Ora di Moera, di soruke, renu di heḡirive au gera raho ketakera.”
-=======
-16 Gerege auka Iesu babatiso ḡahanu, auka eiava seni hakivanu, va uduani iabaraki au baoraḡohi, auki Dirava Horu Aenave eraḡage auki uguhi erehuta uguha naḡate abaga vara au ada. 17 Gerege eno be raki vava seni uguhi onaki ronu, “Ora di Moera, di soruke, auge di heḡirive ra raho ketakera.”
->>>>>>> 1845f90f5c9ff6bc9774bd464cef41f09ad6831f
+\v 16 Eige auka Iesu babatiso ḡahanu, auki eiava seni hakivanu, tutube viege va uduava raki baoraḡi, auki Dirava Horuve eraḡege auki vava seni uguhi erehuta uguha naḡate au abage au variada. \v 17 Gerege eno be raki vava seni uguhi onaki ronu, “Ora di Moera, di soruke, renu di heḡirive au gera raho ketakera.”

04/01.txt

@@ -1,12 +1,3 @@
-<<<<<<< HEAD
 \c 4 \v 1 Gerege Horu Aenava raki Iesu nisiḡami mata ḡaḡaeva otinu diabolo so tohoḡisa. \v 2 Eige auki vani utu-ababu mati vahi utu-ababu aena vi tamuta veite itaharahe auki ḡubu raḡanu. \v 3 Gerege diabolo raki oroḡare kironu. “A Dirava Moe ḡoinu, muni o ḡanito ḡahigeve iau ḡoiraḡohi parao ḡahe.” \v 4 Eduge Iesu raki boriti ḡahanu, “Edube Buka aenava ramu ronu,
 ‘Koita bera beta demaka eiḡu auki maḡuri vima,
-eduge ga inuhati Dirava avaḡehe ro hakivare era.’ ”
-=======
-\v 1 \v 2 \v 3 \v 4 1 Gerege Horu Aena raki Iesu nisiḡami mata ḡaḡaeva otinu diabolo so tohoḡisa.
-2 Iesu raki vani utu-ababu mati vahi utu-ababu tamuta veite eige auki ḡubu raḡanu. 
-3 Eige diabolo raki au ḡasita otare kironu. “Ana Dirava Moe ḡoiege, ama muni o ḡanito ḡahigei iau tamuta demaka ḡahi ḡoiraḡohe.” 
-4 Edube Iesu raki ronu, “Buka Aenava ramu ronu,
-koita bera beta demaka eiḡuge auna maḡuri visa,
-eduge Dirava avaḡehe ga inuhati haki raḡare au gera. ”
->>>>>>> 1845f90f5c9ff6bc9774bd464cef41f09ad6831f
+eduge ga inuhati Dirava avaḡehe ro hakivare era.’ ”

04/05.txt

@@ -1,10 +1,3 @@
-<<<<<<< HEAD
 \v 5 Gerege diabolo raki nisiḡami oḡo aena, Ierusalema otinu, eige auki mi oti dubu ada ramanu, \v 6 auki kiroege, “ A Dirava Moe ḡoinu, oi geroi uguha; edube Buka aenava ramu ronu, ‘Dirava aukena au aneruve ḡanito ḡahi gevege iauna ada ami ugu raḡisa,’
 renu ‘Iauka ada a kamui ugu raḡira vara,
-gerege ai vase ra beta muniva ḡadiḡa vara.’ ”
-=======
-\v 5 \v 6 5 Gerege diabolo raki Iesu nisiḡami oti oḡo aena Ierusalema otime auki dubu ḡurida ramanu, 6 auki kiroege, “Akamu Dirava Moe ra, aso oi geroi uguha; edube Buka ramu ronu,
-Dirava raki au aneruve ḡanito ḡahi gevege iauna a nitabata ḡahisa,
-renu Iauna ai adahe ami iagemisa,
-eige ai vase na beta muni ḡadimisa. ”
->>>>>>> 1845f90f5c9ff6bc9774bd464cef41f09ad6831f
+gerege ai vase ra beta muniva ḡadiḡa vara.’ ”

04/07.txt

@@ -1,6 +1 @@
-<<<<<<< HEAD
-\v 7 Iesu raki kironu, “edube Buka aena ramu ḡaitana ronu, ‘A negu Rohi Bauge ai Diravate tohoḡime,’ ” \v 8 Gerege Diabolo raki ḡaitana nisiḡami otinu nimu ḡadimi kobokahe tiare auki vata ketake basileiave ḡaḡiromi, au erara vaḡa maḡeva mati iaḡa maḡe inuhati uhurahe; \v 9 renu diabolo raki kironu, “A eragevare iaḡaniva inuhati daka mi a moimo vara, a vata komuko daivi renu ama da maḡe ḡahisa a Dirava au kiare ḡumahe.”
-=======
-7 Iesu raki kironu, “Buka ramu ḡaitana ronu, A negu Dirava ai Rohite tohoḡime. ”
-8 Gerege diabolo raki ḡaitana Iesu nisiḡami nimu vava bei ḡadimare, auki vata ketake basileia erara vaḡa maḡe inuhati ḡaḡiromi; 9 mati diabolo raki kironu, “Iaḡa o inuhati daka idigei a moimo vara, a komuko daivi guramare renu da maḡe ḡahege.”
->>>>>>> 1845f90f5c9ff6bc9774bd464cef41f09ad6831f
+\v 7 Iesu raki kironu, “edube Buka aena ramu ḡaitana ronu, ‘A negu Rohi Bauge ai Diravate tohoḡime,’ ” \v 8 Gerege Diabolo raki ḡaitana nisiḡami otinu nimu ḡadimi kobokahe tiare auki vata ketake basileiave ḡaḡiromi, au erara vaḡa maḡeva mati iaḡa maḡe inuhati uhurahe; \v 9 renu diabolo raki kironu, “A eragevare iaḡaniva inuhati daka mi a moimo vara, a vata komuko daivi renu ama da maḡe ḡahisa a Dirava au kiare ḡumahe.”

04/10.txt

@@ -1,7 +1,2 @@
-<<<<<<< HEAD
 \v 10 Iesu raki kironu, “Ḡeahu ote, Satani! Buka aena ramu ronu, ‘Dirava ai Rohite eḡuge ana maḡe ḡahisa,
-renu auḡuge ana au meve kisa.’ ” \v 11 Gerege diabolo raki ḡaremi ḡeahu otinu, ḡamana veite aneru iaberaki oroḡime iauki iaheḡanu.
-=======
-10 Eige Iesu raki kironu,    "Oheseni geahu ote, Satan! Yaukamu torevanu 'Ai Rohite guge ana riaga gahisa, renu augugena ana au meve kisa,'" 
-11 Eige Dibolo varaki garemanu, a aneru yabera rogi yaheganu.
->>>>>>> 1845f90f5c9ff6bc9774bd464cef41f09ad6831f
+renu auḡuge ana au meve kisa.’ ” \v 11 Gerege diabolo raki ḡaremi ḡeahu otinu, ḡamana veite aneru iaberaki oroḡime iauki iaheḡanu.

04/12.txt

@@ -1,6 +1 @@
-<<<<<<< HEAD
-\v 12 Eige Iesu raki ihege Ioane iauki mi vadibu iagava maemanu, gerege auki ḡoiraḡi Galileia otinu. \v 13 Auki Nasareta ḡaremare oti Kaperanamu gurami Galileia gohu ḡaika, Sebuloni mati Napatali iau matamehe,
-=======
-12 Ḡamana veite, Iesu raki ihege aena ḡahe iabeki Ioane mi vadibu iagava maemanu, ḡereḡe auki Iudea ḡaremi Galileia otinu. 
-13 Auki Nasareta garemare otime auki Kaperanamu guramege, Galileia gohu ḡaika, Sebulono mati Naptali iau matame uhura,
->>>>>>> 1845f90f5c9ff6bc9774bd464cef41f09ad6831f
+\v 12 Eige Iesu raki ihege Ioane iauki mi vadibu iagava maemanu, gerege auki ḡoiraḡi Galileia otinu. \v 13 Auki Nasareta ḡaremare oti Kaperanamu gurami Galileia gohu ḡaika, Sebuloni mati Napatali iau matamehe,

04/14.txt

@@ -1,13 +1,3 @@
-<<<<<<< HEAD
 \v 14 eige otavadoana peroveta Isaia rone eraki riaḡa ḡoinu: \v 15 Sebuloni mata, mati Napatali mata,
 ḡumahe oti eve, hakivi Ioridana kasihe, Galileia koita nune nune ia gurahare matahe, \v 16 koitava vadibu uhura uiare ḡahava iauki abaga ketake be eraḡanu,
-renu iana oḡore ia mata ei uiare, renu vadibu uhura maḡuri raḡa Dirava abage ramu iai ada oroḡanu.”
-=======
-14 eige otavado ana peroveta koita Isaia rone eramu riaḡa ḡoisa:
-15 “Sebulono mati Naptali mata ḡahava ia,
-Galileia gohu ḡaika ḡahava oti Ioridana iarova,
-16 koitava iabera vadibu uhura ḡurahege
-iauki abaga ketake be eraḡanu,
-renu oḡore iana mata ei gurahi mati hoḡe uhura uiege
-Dirava abage ramu idigevenu.”
->>>>>>> 1845f90f5c9ff6bc9774bd464cef41f09ad6831f
+renu iana oḡore ia mata ei uiare, renu vadibu uhura maḡuri raḡa Dirava abage ramu iai ada oroḡanu.”

04/17.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 17 Nega eige Iesu raki avaḡu haroro vi, roege, “Iai daureve iau ḡoiraḡohiahe, badiva va basileia vara hugure.”
-=======
-17 Nega eige Iesu raki au hari maḡe roege, “Iama iai ḡuma daureve ḡare geisa, badiva va basileia vara hugure.”
->>>>>>> 1845f90f5c9ff6bc9774bd464cef41f09ad6831f
+\v 17 Nega eige Iesu raki avaḡu haroro vi, roege, “Iai daureve iau ḡoiraḡohiahe, badiva va basileia vara hugure.”

04/title.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-Sapta 4
-=======
-Matthew Ababu
->>>>>>> 1845f90f5c9ff6bc9774bd464cef41f09ad6831f
+Sapta 4

manifest.json

@@ -63,6 +63,18 @@
 		"02-22",
 		"03-title",
 		"03-01",
+		"03-04",
+		"03-07",
+		"03-10",
+		"03-13",
+		"03-16",
+		"04-title",
+		"04-01",
+		"04-05",
+		"04-07",
+		"04-10",
+		"04-12",
+		"04-14",
 		"07-11",
 		"09-29",
 		"11-07",