From a273bd4c0e01ac065f439fca89d003c43581bcf0 Mon Sep 17 00:00:00 2001 From: klero Date: Wed, 2 Nov 2022 13:38:10 +0200 Subject: [PATCH] Wed Nov 02 2022 13:38:10 GMT+0200 (Central Africa Time) --- 14/23.txt | 7 +------ 14/28.txt | 6 +----- 14/31.txt | 6 +----- 14/34.txt | 6 +----- 15/01.txt | 7 +------ manifest.json | 5 +++++ 6 files changed, 10 insertions(+), 27 deletions(-) diff --git a/14/23.txt b/14/23.txt index 0b1d024..f17bbdc 100644 --- a/14/23.txt +++ b/14/23.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 23 Oto lahitok ojo,Ifwo kikohin fad kuna longon kiji lo kangite itorihohi cio ofwonu ojir kaji nei ifut. \v 24 Ahirihohi oru lobo to kiji lo kunu cio ngole lilolongi lolotu imang daha lo karama nei.'' -======= -\v 23 Oto lahitok ojo,Ifwo kikohin fad kuna longon kiji lo kangite itorihohi cio ofwonu ojir kaji nei ifut. -\v 24 Ahirihohi oru lobo to kiji lo kunu cio ngole lilolongi lolotu imang daha lo karama nei ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 23 Oto lahitok ojo,Ifwo kikohin fad kuna longon kiji lo kangite itorihohi cio ofwonu ojir kaji nei ifut. \v 24 Ahirihohi oru lobo to kiji lo kunu cio ngole lilolongi lolotu imang daha lo karama nei.'' \ No newline at end of file diff --git a/14/28.txt b/14/28.txt index c892588..347bdbc 100644 --- a/14/28.txt +++ b/14/28.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 28 Adi ba ngowak lobo to kiji ningi duho kaji na ikarit. Ngida ba re inyi itongohino kof itutum bolojun ko karitun nenge odeyare kolotum robia kunenge keruno duho? \v 29 Tonyio kalijuk ca inyi tadati lo kaji ida hati okeru duho, cio fad kuna lodeya omongati ca inyi \v 30 ojo, ‘icak lerok duho ida hati otum keruno’. -======= -\v 28 Adi ba ngowak lobo to kiji ningi duho kaji na ikarit. Ngida ba re inyi itongohino kof itutum bolojun ko karitun nenge odeyare kolotum robia kunenge keruno duho? \v 29 Tonyio kalijuk ca inyi tadati lo kaji ida hati okeru duho, cio fad kuna lodeya omongati ca inyi \v 30 ojo, ‘icak lerok duho ida hati otum keruno’. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 28 Adi ba ngowak lobo to kiji ningi duho kaji na ikarit. Ngida ba re inyi itongohino kof itutum bolojun ko karitun nenge odeyare kolotum robia kunenge keruno duho? \v 29 Tonyio kalijuk ca inyi tadati lo kaji ida hati okeru duho, cio fad kuna lodeya omongati ca inyi \v 30 ojo, ‘icak lerok duho ida hati otum keruno’. \ No newline at end of file diff --git a/14/31.txt b/14/31.txt index c8698af..833427d 100644 --- a/14/31.txt +++ b/14/31.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 31 Kode ngowoju lobo kabu oloro rem ko lobo kabu. Ida re ca inyi itongo kof ode kolotum inyi to asegere alif tomon kitiremo nu lolotuno diho inyi ko asegere alif keek are? \v 32 kalida inyi otum ocule ca inyi cio lo fworo kitirico lu kabu bito orihe oloma lo foro tenya lo yomo. \v 33 Tona kikoi bito lobo to kiji ningi lida otum ngerihino sangite fad, ida otum rahun kajifitani nei. -======= -\v 31 Kode ngowoju lobo kabu oloro rem ko lobo kabu. Ida re ca inyi itongo kof ode kolotum inyi to asegere alif tomon kitiremo nu lolotuno diho inyi ko asegere alif keek are? \v 32 kalida inyi otum ocule ca inyi cio lo fworo kitirico lu kabu bito orihe oloma lo foro tenya lo yomo. \v 33 Tona kikoi bito lobo to kiji ningi lida otum ngerihino sangite fad, ida otum rahun kajifitani nei. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 31 Kode ngowoju lobo kabu oloro rem ko lobo kabu. Ida re ca inyi itongo kof ode kolotum inyi to asegere alif tomon kitiremo nu lolotuno diho inyi ko asegere alif keek are? \v 32 kalida inyi otum ocule ca inyi cio lo fworo kitirico lu kabu bito orihe oloma lo foro tenya lo yomo. \v 33 Tona kikoi bito lobo to kiji ningi lida otum ngerihino sangite fad, ida otum rahun kajifitani nei. \ No newline at end of file diff --git a/14/34.txt b/14/34.txt index 0de0647..8b99dd3 100644 --- a/14/34.txt +++ b/14/34.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 34 Ojir balang ati kalitiri balang lemun nenge aja ca itweruni ki nyiahahino na lemun? \v 35 Lida ojir tolobo tohi keken kode to koforo kode to mona, ojir ibirori oleng. Na longon ko kiyoha kulo ningo, ingohi toning”. -======= -\v 34 Ojir balang ati kalitiri balang lemun nenge aja ca itweruni ki nyiahahino na lemun? \v 35 Lida ojir tolobo tohi keken kode to koforo kode to mona, ojir ibirori oleng. Na longon ko kiyoha kulo ningo, ingohi toning” ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 34 Ojir balang ati kalitiri balang lemun nenge aja ca itweruni ki nyiahahino na lemun? \v 35 Lida ojir tolobo tohi keken kode to koforo kode to mona, ojir ibirori oleng. Na longon ko kiyoha kulo ningo, ingohi toning”. \ No newline at end of file diff --git a/15/01.txt b/15/01.txt index dba2551..69fdfd4 100644 --- a/15/01.txt +++ b/15/01.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\c 15 \v 1 Tinyia ofwonu katisofok kulo mucoro ko kapalak, itongoti iriti inyi ningo tenya nenge. \v 2 Ati ofwonu Parisihin ko katiyenak kulo cik ongungunita ojo, “Ifotunita lerok kapalak odaha manyu ko icieng”. -======= -\c 15 \v 1 Tinyia ofwonu katisofok kulo mucoro ko kapalak, itongoti iriti inyi ningo tenya nenge. \v 2 Ati ofwonu -Parisihin ko katiyenak kulo cik ongungunita ojo, “Ifotunita lerok kapalak odaha manyu ko icieng”. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\c 15 \v 1 Tinyia ofwonu katisofok kulo mucoro ko kapalak, itongoti iriti inyi ningo tenya nenge. \v 2 Ati ofwonu Parisihin ko katiyenak kulo cik ongungunita ojo, “Ifotunita lerok kapalak odaha manyu ko icieng”. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 61d47b6..4cd26b5 100644 --- a/manifest.json +++ b/manifest.json @@ -196,8 +196,13 @@ "14-13", "14-15", "14-18", + "14-23", "14-25", + "14-28", + "14-31", + "14-34", "15-title", + "15-01", "15-03", "15-06", "15-08",