From 73b88f6097774fee8c2f77ae9c1e3724644a41f6 Mon Sep 17 00:00:00 2001 From: klero Date: Wed, 2 Nov 2022 14:16:25 +0200 Subject: [PATCH] Wed Nov 02 2022 14:16:25 GMT+0200 (Central Africa Time) --- 01/80.txt | 6 +----- 02/01.txt | 6 +----- 02/04.txt | 6 +----- 02/06.txt | 6 +----- 02/title.txt | 6 +----- manifest.json | 4 ++++ 6 files changed, 9 insertions(+), 25 deletions(-) diff --git a/01/80.txt b/01/80.txt index 6f3d6ee..1edccbb 100644 --- a/01/80.txt +++ b/01/80.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 80 Manyu obolo kito olotu ogol iyo okorif na inyu. Manyu itongo inyi katwa lo kuny many olotu obotore taranydiho Isirael fad. -======= -\v 80 Manyu obolo kito olotu ogol iyo okorif na inyu. Manyu itongo inyi katwa lo kuny many olotu obotore taranydiho Isirael fad.Otomone lo Yesu ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 80 Manyu obolo kito olotu ogol iyo okorif na inyu. Manyu itongo inyi katwa lo kuny many olotu obotore taranydiho Isirael fad. \ No newline at end of file diff --git a/02/01.txt b/02/01.txt index 1069a2a..6b2464b 100644 --- a/02/01.txt +++ b/02/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 2 \v 1 To kunu faritin ico Cesar Agusto cik ojo ojir ikeni cio fad to kof lo Roma. \v 2 (ketemoni lo kikena ene lafa litiihino orumu Kwirino ara gavuna lo Siria). \v 3 Ofwo cio pili fajihit kulo kangite kuneiceng kigeroro. -======= -\c 2 \v 1 To kunu faritin ico Cesar Agusto cik ojo ojir ikeni cio fad to kof lo Roma. \v 2 (ketemoni lo kikena ene lafa litiihino orumu Kwirino ara gavuna lo Siria). \v 3 Ofwo cio pili fajihit kulo kangite kuneiceng kigeroro ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\c 2 \v 1 To kunu faritin ico Cesar Agusto cik ojo ojir ikeni cio fad to kof lo Roma. \v 2 Ketemoni lo kikena ene lafa litiihino orumu Kwirino ara gavuna lo Siria. \v 3 Ofwo cio pili fajihit kulo kangite kuneiceng kigeroro. \ No newline at end of file diff --git a/02/04.txt b/02/04.txt index a525386..fd026e2 100644 --- a/02/04.txt +++ b/02/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 Josep manyu ko loro to Nazaret na longon kof lo Galilea iya Judea, Betlem kang lo David tonyio ara inyi lo agwala lo kolo David. \v 5 Olo inyi ija kigero ko Meri na lorumu ociharu yemaru ko inyi orumu ligar. -======= -\v 4 Josep manyu ko loro to Nazaret na longon kof lo Galilea iya Judea, Betlem kang lo David tonyio ara inyi lo agwala lo kolo David. \v 5 Olo inyi ija kigero ko Meri na lorumu ociharu yemaru ko inyi orumu ligar ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 4 Josep manyu ko loro to Nazaret na longon kof lo Galilea iya Judea, Betlem kang lo David tonyio ara inyi lo agwala lo kolo David. \v 5 Olo inyi ija kigero ko Meri na lorumu ociharu yemaru ko inyi orumu ligar. \ No newline at end of file diff --git a/02/06.txt b/02/06.txt index d0c6783..193e4de 100644 --- a/02/06.txt +++ b/02/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 kolongon iceng ija ogoru tik lo tomonun lo Meri. \v 7 Inyi ko tomonu okang nenge kito retoni. Obubur inyi idole nenge to kyelani ko kitigetohino iyo twol lo sang tonyio oru faji diho iceng to kaji lowelo. -======= -\v 6 kolongon iceng ija ogoru tik lo tomonun lo Meri. \v 7 Inyi ko tomonu okang nenge kito retoni. Obubur inyi idole nenge to kyelani ko kitigetohino iyo twol lo sang tonyio oru faji diho iceng to kaji lo welo. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 6 kolongon iceng ija ogoru tik lo tomonun lo Meri. \v 7 Inyi ko tomonu okang nenge kito retoni. Obubur inyi idole nenge to kyelani ko kitigetohino iyo twol lo sang tonyio oru faji diho iceng to kaji lowelo. \ No newline at end of file diff --git a/02/title.txt b/02/title.txt index 92306d7..489b8ca 100644 --- a/02/title.txt +++ b/02/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Kingutit 2 -======= -Kingutit 2 ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +Kingutit 2 \ No newline at end of file diff --git a/manifest.json b/manifest.json index 3967087..5be8d19 100644 --- a/manifest.json +++ b/manifest.json @@ -69,6 +69,10 @@ "01-72", "01-76", "01-78", + "01-80", + "02-title", + "02-01", + "02-04", "02-08", "02-10", "02-17",