Tue Jul 25 2023 14:27:38 GMT+1000 (Papua New Guinea Time)

01/22.txt

@@ -1,8 +1 @@
-<<<<<<< HEAD
-\v 22 Onaki ḡuma ora Dirava peroveta ḡahane gava riaḡa ḡahi ḡavara, \v 23 “Eraḡiahe, maeaḡo bera detu ḡoi ḡami be mimi vara, renu ihe rosa Emanuela,” makava ramu, “Dirava ra no ruta gera.”
-=======
-22 Onaki ḡuma ora Dirava gare peroveta ḡahi rone riaḡa ḡahiḡa vara,
-23 “Eraḡiahe, maeaḡo bera detu ḡoi ḡami be mimi vara,
-renu yauka ihiva rosa Emmanuela,”-
-makava ramu, “Dirava ra no ruta gera.”
->>>>>>> 1845f90f5c9ff6bc9774bd464cef41f09ad6831f
+\v 22 Onaki ḡuma ora Dirava peroveta ḡahane gava riaḡa ḡahi ḡavara, \v 23 “Eraḡiahe, maeaḡo bera detu ḡoi ḡami be mimi vara, renu ihe rosa Emanuela,” makava ramu, “Dirava ra no ruta gera.”

01/24.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 24 Iosepa raki ḡaḡohi raḡi urimi, Dirava aneruve iaḡo kirone ḡumahe; Maria mi au mabareni kinu, \v 25 eduge iauka so iau abu iaḡia kobuḡa veite uhura auki gami manu; eige Iosepa raki ihiva kinu Iesu.
-=======
-24 Joseph raki ḡaḡohi raḡi urimi, Dirava aneruve iaḡo kirone ḡumahe; Maria mi au mabareni kinu, 25 eduge iauka so iau abu iaḡia kobuḡa veite uhura auki ḡami manu; eige Iosepa raki ihiva kinu Iesu.
->>>>>>> 1845f90f5c9ff6bc9774bd464cef41f09ad6831f
+\v 24 Iosepa raki ḡaḡohi raḡi urimi, Dirava aneruve iaḡo kirone ḡumahe; Maria mi au mabareni kinu, \v 25 eduge iauka so iau abu iaḡia kobuḡa veite uhura auki gami manu; eige Iosepa raki ihiva kinu Iesu.

02/01.txt

@@ -1,7 +1 @@
-<<<<<<< HEAD
-\c 2 \v 1 Iesu ramu Betelehema Iuda eigera auki ḡuruanu. Heroda Iuda rohiva ḡoine uhura, uhuvaka ḡaha bea vani ḡadiḡa kasiva seni Ierusalema oroḡanu, \v 2 berabe raḡi, “Ama ḡami karuka be guruane Iuda ḡaha iau rohive na oreigenu? Vava ge noki koro abaga eraḡi, noka maḡe ḡahisa rome noki oroḡanu.” \v 3 Heroda iau Rohite gava ihinei, au soruke raki huhunaḡi, renu Ierusalema uiege ḡahava dadaḡa ḡainage uhu huhu raḡanu.
-=======
-1 Iesu ramu Betelehema Iuda eige auki ḡuruanu. Heroda Iudea rohiva ḡoine uhura, uhuvaka ḡaha bea vani ḡadiḡa kasiva seni Ierusalema oroḡanu, 
-2 berabe raḡI, “Ama ḡami karuka be guruane Iudea ḡaha iau rohive na oreigenu? Vava ge noki koro abaga eraḡI, noka maḡe ḡahisa rome noki oroḡanu.” 
-3 Heroda iau Rohite gava ihinei, au soruke raki huhunaḡi, renu Ierusalema uiege ḡahava dadaḡa ḡainage uhu huhu raḡanu.
->>>>>>> 1845f90f5c9ff6bc9774bd464cef41f09ad6831f
+\c 2 \v 1 Iesu ramu Betelehema Iuda eigera auki ḡuruanu. Heroda Iuda rohiva ḡoine uhura, uhuvaka ḡaha bea vani ḡadiḡa kasiva seni Ierusalema oroḡanu, \v 2 berabe raḡi, “Ama ḡami karuka be guruane Iuda ḡaha iau rohive na oreigenu? Vava ge noki koro abaga eraḡi, noka maḡe ḡahisa rome noki oroḡanu.” \v 3 Heroda iau Rohite gava ihinei, au soruke raki huhunaḡi, renu Ierusalema uiege ḡahava dadaḡa ḡainage uhu huhu raḡanu.

02/04.txt

@@ -1,10 +1,2 @@
-<<<<<<< HEAD
 \v 4 Gerege auki dubu baugea mati aena ḡahava ia inuhati ihirogei bouge beragei, “Negu iau Keriso roiare na oreigena au ḡuruisa vima?” \v 5 Iauka roia, “Betelehema Iudea uhura; ora peroveta ḡaha rone gava vara: \v 6 ‘Koita iai bouge, Betelehema, Iudea mata uhura, iaka Iudea mata ketake rohi ḡahare uhura iau vaḡa oḡo avie bera, iai vaḡotoni rohi koita vana oroḡisa,
-auka di koita tuhea Isaraela uriḡatuisa renu nitabata ḡahisa.’ ”
-=======
-4 Gerege auki dubu baugea mati aena ḡahava ia inuhati ihirogei bouge beragei, “Negu iau Keriso roiare na oreigena au ḡuruisa vima?” 
-5 Iauka roia, “Betelehema Iudea uhura; ora peroveta ḡaha rone gava vara:
-6 Koita iai bouge, Betelehema, Iudea mata uhura,
-iaka Iudea mata ketake rohi ḡahare uhura iau vaḡa oḡo avie bera,
-iai vaḡotoni rohi koita vana oroḡisa,
->>>>>>> 1845f90f5c9ff6bc9774bd464cef41f09ad6831f
+auka di koita tuhea Isaraela uriḡatuisa renu nitabata ḡahisa.’ ”

02/07.txt

@@ -1,6 +1 @@
-<<<<<<< HEAD
-\v 7 Eige Heroda raki ḡoḡohu deivaia vani ḡadiḡava oroḡane norena ihirogei beragei negu koro ena vaisu gena au ḡaḡae ḡoinu. \v 8 Gerege auki besugei, roege, “Otiahe Betelehema negu ḡami karuka iama reḡunaki iaḡoisa, ia behuḡege, iama da vasiba ḡahege da tage dama oti maḡe ḡahisa.”
-=======
-7 Eige Heroda raki ḡoḡohu deivaia vani ḡadiḡava oroḡane norena ihirogei beragei negu koro ena vaisu gena au ḡaḡae ḡoinu. 
-8 Gerege auki besugei, roege, “Otiahe Betelehema negu ḡami karuka iama reḡunaki iaḡoisa, ia behuḡege, iama da vasiba ḡahege da tage dama oti maḡe ḡahisa.”
->>>>>>> 1845f90f5c9ff6bc9774bd464cef41f09ad6831f
+\v 7 Eige Heroda raki ḡoḡohu deivaia vani ḡadiḡava oroḡane norena ihirogei beragei negu koro ena vaisu gena au ḡaḡae ḡoinu. \v 8 Gerege auki besugei, roege, “Otiahe Betelehema negu ḡami karuka iama reḡunaki iaḡoisa, ia behuḡege, iama da vasiba ḡahege da tage dama oti maḡe ḡahisa.”

02/09.txt

@@ -1,6 +1 @@
-<<<<<<< HEAD
-\v 9 Iauki oḡo rohi e gare ihare, iauki ḡarehare otinu, renu iau ḡumaḡa otege uhura iauki ḡaitana koro vani ḡadiḡava seni uriḡatugei eraḡanu, auki ḡami karuka variada ge auki daivanu. \v 10 Iau koro eraḡane era daivi iauki heḡiri raḡohege.
-=======
-9 Iauki oḡo rohi e gare ihare, iauki ḡarehare otinu, renu iau ḡumaḡa otege uhura iauki ḡaitana koro vani ḡadiḡava seni uriḡatugei eraḡanu, auki ḡami karuka variada ge auki daivanu. 
-10 Iau koro eraḡane era daivi iauki heḡiri raḡohege.
->>>>>>> 1845f90f5c9ff6bc9774bd464cef41f09ad6831f
+\v 9 Iauki oḡo rohi e gare ihare, iauki ḡarehare otinu, renu iau ḡumaḡa otege uhura iauki ḡaitana koro vani ḡadiḡava seni uriḡatugei eraḡanu, auki ḡami karuka variada ge auki daivanu. \v 10 Iau koro eraḡane era daivi iauki heḡiri raḡohege.

02/11.txt

@@ -1,6 +1 @@
-<<<<<<< HEAD
-\v 11 Iauki iaga uhura siri raḡi, negu ḡami karuka au neine Maria ḡore eragei; iauki komuko daivi maḡe ḡahigei. Renu koba koba ḡami karuka eni iaḡMMa maḡe idigei oro ḡevene, golo, muraka ḡutika maḡete, mati idi vadaka ahata roiro iaḡava, idigei moimanu. \v 12 Renu Dirava raki iaḡo boriti ḡahigei iauka beta ḡoiraḡohi Heroda ḡasina otisa, eige iauki ḡuma nune bei ḡoiraḡohi iau matamehe otinu.
-=======
-11 Iauki iaga uhura siri raḡi, negu ḡami karuka au neine Maria ḡore eragei; iauki komuko daivi maḡe ḡahigei. Renu koba koba ḡami karuka eni iaḡa maḡe idigei oro ḡevene, golo, muraka ḡutika maḡete, mati idi vadaka ahata roiro iaḡava, idigei moimanu. 
-12 Renu Dirava raki iaḡo boriti ḡahigei iauka beta ḡoiraḡohi Heroda ḡasina otisa, eige iauki ḡuma nune bei ḡoiraḡohi iau matamehe otinu.
->>>>>>> 1845f90f5c9ff6bc9774bd464cef41f09ad6831f
+\v 11 Iauki iaga uhura siri raḡi, negu ḡami karuka au neine Maria ḡore eragei; iauki komuko daivi maḡe ḡahigei. Renu koba koba ḡami karuka eni iaḡMMa maḡe idigei oro ḡevene, golo, muraka ḡutika maḡete, mati idi vadaka ahata roiro iaḡava, idigei moimanu. \v 12 Renu Dirava raki iaḡo boriti ḡahigei iauka beta ḡoiraḡohi Heroda ḡasina otisa, eige iauki ḡuma nune bei ḡoiraḡohi iau matamehe otinu.

02/13.txt

@@ -1,6 +1 @@
-<<<<<<< HEAD
-\v 13 Negu deivaia otine itaharahe, Rohi Bauge aneruve raki iaḡo Iosepa ḡasina ḡaḡae ḡoi, kironu. “Urimi ḡami karuka au neine ḡorehe idigei siviḡoro raḡi Aikupito otiahe. Iama ei gurahi ate da ia kiro gevege, badiva Heroda ra ḡami karuka ora auki iaḡoima, auka ḡami hoekisa roma.” \v 14 Gerege Iosepa raki ḡaḡohe raḡi urimare, ḡami karuka mati au neine ḡore vahi uhura, idigevare Aikupito otinu, \v 15 eige iauki gurahi ate Heroda raki hoḡe raḡanu. Onaki ora Rohi Bauge gare riaḡa ḡahi peroveta ḡahi ronu, “Aikupito ge daki di moe ihiromonu.”
-=======
-Siviḡoro raḡi Aikupito otinu
-13 Negu deivaia otine itaharahe, Rohi Bauge aneruve raki iaḡo Iosepa ḡasina ḡaḡae ḡoi, kironu. “Urimi ḡami karuka au neine ḡorehe idigei siviḡoro raḡi Aikupito otiahe. Iama ei gurahi ate da ia kiro gevege, badiva Heroda ra ḡami karuka ora auki iaḡoima, auka ḡami hoekisa roma.” 14 Gerege Iosepa raki ḡaḡohe raḡi urimare, ḡami karuka mati au neine ḡore vahi uhura, idigevare Aikupito otinu, 15 eige iauki gurahi ate Heroda raki hoḡe raḡanu. Onaki ora Rohi Bauge gare riaḡa ḡahi peroveta ḡahi ronu, “Aikupito ge daki di moe ihiromonu.”
->>>>>>> 1845f90f5c9ff6bc9774bd464cef41f09ad6831f
+\v 13 Negu deivaia otine itaharahe, Rohi Bauge aneruve raki iaḡo Iosepa ḡasina ḡaḡae ḡoi, kironu. “Urimi ḡami karuka au neine ḡorehe idigei siviḡoro raḡi Aikupito otiahe. Iama ei gurahi ate da ia kiro gevege, badiva Heroda ra ḡami karuka ora auki iaḡoima, auka ḡami hoekisa roma.” \v 14 Gerege Iosepa raki ḡaḡohe raḡi urimare, ḡami karuka mati au neine ḡore vahi uhura, idigevare Aikupito otinu, \v 15 eige iauki gurahi ate Heroda raki hoḡe raḡanu. Onaki ora Rohi Bauge gare riaḡa ḡahi peroveta ḡahi ronu, “Aikupito ge daki di moe ihiromonu.”

02/16.txt

@@ -1,6 +1 @@
-<<<<<<< HEAD
-\v 16 Eigera Heroda uhure raki baoraḡanu deiva vani ḡadiḡa seni oroḡone iabaki taraḡanu. Eige auki hoḡoi, ga maemi ḡanito ḡahigei ronu, oti Betelehema mati au oriḡi oḡova iau, ḡami mo iau taue abu mati karukare inuhati iama ḡahigei hoeki geisa.
-=======
-\v 16 Ḡami karuka ḡahi gevenu
-16 Eigera Heroda uhure raki baoraḡanu deiva vani ḡadiḡa seni oroḡone iabaki taraḡanu. Eige auki hoḡoi, ga maemi ḡanito ḡahigei ronu, oti Betelehema mati au oriḡi oḡova iau, ḡami mo iau taue abu mati karukare inuhati iama ḡahigei hoeki geisa.
->>>>>>> 1845f90f5c9ff6bc9774bd464cef41f09ad6831f
+\v 16 Eigera Heroda uhure raki baoraḡanu deiva vani ḡadiḡa seni oroḡone iabaki taraḡanu. Eige auki hoḡoi, ga maemi ḡanito ḡahigei ronu, oti Betelehema mati au oriḡi oḡova iau, ḡami mo iau taue abu mati karukare inuhati iama ḡahigei hoeki geisa.

02/17.txt

@@ -1,11 +1 @@
-<<<<<<< HEAD
-\v 17 Eige otavado ana peroveta koita Ieremia rone gava raki riaḡa ḡoinu, \v 18 Eno bera iauki ihinu Rama seni, aukamu nivi ḡariri vima renu nina ava dahida, Reisel raki au ḡamuhe iau ninave vima; auka besibe vima bera vaḡahu ḡahisa, badiva iakamu hoḡe raḡanu.”
-=======
-17 Eige otavado ana peroveta koita Ieremia rone gava raki riaḡa ḡoinu,
-p.3
-
-18 Eno bera iauki ihinu Rama seni,
-aukamu nivi ḡariri vima renu nina ava dahida,
-Reisel raki au ḡamuhe iau ninave vima;
-auka besibe vima bera vaḡahu ḡahisa, badiva iakamu hoḡe raḡanu.”
->>>>>>> 1845f90f5c9ff6bc9774bd464cef41f09ad6831f
+\v 17 Eige otavado ana peroveta koita Ieremia rone gava raki riaḡa ḡoinu, \v 18 Eno bera iauki ihinu Rama seni, aukamu nivi ḡariri vima renu nina ava dahida, Reisel raki au ḡamuhe iau ninave vima; auka besibe vima bera vaḡahu ḡahisa, badiva iakamu hoḡe raḡanu.”

02/19.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 19 Heroda hoḡe raḡege, Iosepa Aikupito uiege uhura Rohi bauge aneruve raki iaḡo au ḡasina ḡaḡae ḡoiare kironu, \v 20 “Urima, ḡami karuka renu au neine ḡore idigei ḡoiraḡi Isaraela matava ote, badiva oḡore iana ḡami karuka e ḡamisa roiare ḡahava iabaramu buda raḡohanu. \v 21 Eige Iosepa raki urimare ḡami karuka au neine ḡore idigei ḡoiraḡi Isaraela otinu.
-=======
-\v 19 \v 20 \v 21 19 Heroda hoḡe raḡege, Iosepa Aikupito uiege uhura Rohi bauge aneruve raki iaḡo au ḡasina ḡaḡae ḡoiare kironu, 20 “Urima, ḡami karuka renu au neine ḡore idigei ḡoiraḡi Isaraela matava ote, badiva oḡore iana ḡami karuka e ḡamisa roiare ḡahava iabaramu buda raḡohanu. 21 Eige Iosepa raki urimare ḡami karuka au neine ḡore idigei ḡoiraḡi Isaraela otinu.
->>>>>>> 1845f90f5c9ff6bc9774bd464cef41f09ad6831f
+\v 19 Heroda hoḡe raḡege, Iosepa Aikupito uiege uhura Rohi bauge aneruve raki iaḡo au ḡasina ḡaḡae ḡoiare kironu, \v 20 “Urima, ḡami karuka renu au neine ḡore idigei ḡoiraḡi Isaraela matava ote, badiva oḡore iana ḡami karuka e ḡamisa roiare ḡahava iabaramu buda raḡohanu. \v 21 Eige Iosepa raki urimare ḡami karuka au neine ḡore idigei ḡoiraḡi Isaraela otinu.

02/22.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 22 Eduge Iosepa raki ihege Arkelas raki au mame Heroda vataḡe mi Iudea rohi ḡoinu, eige auki mata ei otito siḡovanu. Auka iaḡo ge Dirava raki ḡanito ḡahanu, eige iauki urihi Galileia kasi bei otinu. \v 23 Eige auki iau guragu oḡe kinu ihivara Nasareta. Gerege otavado ana peroveta ḡahaia ro maemanu ramu riaḡa ḡahanu, “Auka Nasareta koita vara.”
-=======
-\v 22 \v 23 22 Eduge Iosepa raki ihege Arkelas raki au mame Heroda vataḡe mi Iudea rohi ḡoinu, eige auki mata ei otito siḡovanu. Auka iaḡo ge Dirava raki ḡanito ḡahanu, eige iauki urihi Galileia kasi bei otinu. 23 Eige auki iau guragu oḡe kinu ihivara Nasareta. Gerege otavado ana peroveta ḡahaia ro maemanu ramu riaḡa ḡahanu, “Auka Nasareta koita vara.”
->>>>>>> 1845f90f5c9ff6bc9774bd464cef41f09ad6831f
+\v 22 Eduge Iosepa raki ihege Arkelas raki au mame Heroda vataḡe mi Iudea rohi ḡoinu, eige auki mata ei otito siḡovanu. Auka iaḡo ge Dirava raki ḡanito ḡahanu, eige iauki urihi Galileia kasi bei otinu. \v 23 Eige auki iau guragu oḡe kinu ihivara Nasareta. Gerege otavado ana peroveta ḡahaia ro maemanu ramu riaḡa ḡahanu, “Auka Nasareta koita vara.”

02/title.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-Sapta 2
-=======
-Matthew Abu
->>>>>>> 1845f90f5c9ff6bc9774bd464cef41f09ad6831f
+Sapta 2

03/title.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-Sapta 3
-=======
-Matthew Abigaga
->>>>>>> 1845f90f5c9ff6bc9774bd464cef41f09ad6831f
+Sapta 3

manifest.json

@@ -48,6 +48,19 @@
 		"01-15",
 		"01-18",
 		"01-20",
+		"01-22",
+		"01-24",
+		"02-title",
+		"02-01",
+		"02-04",
+		"02-07",
+		"02-11",
+		"02-13",
+		"02-16",
+		"02-17",
+		"02-19",
+		"02-22",
+		"03-title",
 		"07-11",
 		"09-29",
 		"11-07",