From 67e22697f3d20223ef6aee9dabdce5424c2df129 Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Thu, 26 Nov 2020 17:31:34 +1100 Subject: [PATCH] Thu Nov 26 2020 17:31:33 GMT+1100 (AUS Eastern Daylight Time) --- 02/14.txt | 6 +----- 02/16.txt | 6 +----- manifest.json | 2 ++ 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/02/14.txt b/02/14.txt index 8af086a..d03f100 100644 --- a/02/14.txt +++ b/02/14.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 14 Dirava na hanamoamu, Keriso lalonai nega iboudiai egunalai maimu bona ehakwalimu maimu, bona ia sivaraina bonana namona mai laloparara na gabu iboudiai. \v 15 Ita na Keriso bonana namona Dirava ena, vada ehamauridia bona e boio taudia padadia amo - -======= -\v 14 Dirava na tanikiu heniamu Keriso lalonai nega iboudiai eguna lai maimu bona eha kwalimumaimu, ia sivaraina bonana namona, gabu idoinai. \v 15 Ita Keriso bonana namona dirava ena, vada ehamaurida bona e boio taudia padadia amo. ->>>>>>> 6016a485b688ec4a7fb292c95854e09de649a8c3 +\v 14 Dirava na hanamoamu, Keriso lalonai nega iboudiai egunalai maimu bona ehakwalimu maimu, bona ia sivaraina bonana namona mai laloparara na gabu iboudiai. \v 15 Ita na Keriso bonana namona Dirava ena, vada ehamauridia bona e boio taudia padadia amo - \ No newline at end of file diff --git a/02/16.txt b/02/16.txt index 1c7e601..4a6663f 100644 --- a/02/16.txt +++ b/02/16.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 16 Momokani vaitani, ini idia ediai mase bonana ta amo mase, to kahanai mauri bonana namona ese mauri ehavaraiamu. Daika be hereadae ini gau ai? \v 17 Badina ai na dia taunimanima haida hegeregeredia be Dirava ena hereva na ahoihoilaiamu mai davana gauna, to mai momokani mai ida, Dirava ese Keriso lalonai ehenimai mu hegeregerena Dirava vairanai aherevamu Keriso lalonai. -======= -\v 16 Namona tamona, ini idia edia mase bonana ta amo ela mase, to kahanai mauri bonana namona ese mauri ehavaraiamu. \v 17 Badina aina dia haida ->>>>>>> 6016a485b688ec4a7fb292c95854e09de649a8c3 +\v 16 Momokani vaitani, ini idia ediai mase bonana ta amo mase, to kahanai mauri bonana namona ese mauri ehavaraiamu. Daika be hereadae ini gau ai? \v 17 Badina ai na dia taunimanima haida hegeregeredia be Dirava ena hereva na ahoihoilaiamu mai davana gauna, to mai momokani mai ida, Dirava ese Keriso lalonai ehenimai mu hegeregerena Dirava vairanai aherevamu Keriso lalonai. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 5bddb5b..cdb30a3 100644 --- a/manifest.json +++ b/manifest.json @@ -59,6 +59,8 @@ "02-08", "02-10", "02-12", + "02-14", + "02-16", "03-title", "03-01", "03-04",