From 443f14bbff498a6d316ef58f34fe16ba9761eaea Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Tue, 22 Oct 2019 15:19:54 +0200 Subject: [PATCH] Tue Oct 22 2019 15:19:53 GMT+0200 (South Africa Standard Time) --- 05/title.txt | 6 +----- 06/26.txt | 6 +----- 06/title.txt | 6 +----- 10/title.txt | 6 +----- front/title.txt | 6 +----- 5 files changed, 5 insertions(+), 25 deletions(-) diff --git a/05/title.txt b/05/title.txt index 150a3d0..17b9bae 100644 --- a/05/title.txt +++ b/05/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Kebuke 5 -======= -Kebuki 5 : 1 - 20 ->>>>>>> bdecb83ea127cb1be06c9e3bb2420953e3f30a8a +Kebuke 5 \ No newline at end of file diff --git a/06/26.txt b/06/26.txt index 472a850..66c51dc 100644 --- a/06/26.txt +++ b/06/26.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 26 Mokota ota mowa mpuyi mona motema, ebange ante wata bangi wa ketieki meabi, isa kolo ko keta bowa banto andiye noo na onde. \v 27 Na ko toma monto ande wa mokambo omonka, wa use moche a Yohane mubatizai. \v 28 Owa monto wande otaya na komo bunda Yohane mona mosunge, na ko esa moche bowa ba mo ondie bange ba monda. -======= -\v 29 Mekutcha ya Yesu, bowa ba umbgiye bango, aboso ba koemba mobe, baeka mono nkito. ->>>>>>> bdecb83ea127cb1be06c9e3bb2420953e3f30a8a +\v 29 \v 26 Mokota ota mowa mpuyi mona motema, ebange ante wata bangi wa ketieki meabi, isa kolo ko keta bowa banto andiye noo na onde. \v 27 Na ko toma monto ande wa mokambo omonka, wa use moche a Yohane mubatizai. \v 28 Owa monto wande otaya na komo bunda Yohane mona mosunge, na ko esa moche bowa ba mo ondie bange ba monda. \ No newline at end of file diff --git a/06/title.txt b/06/title.txt index 26d1949..0a29b69 100644 --- a/06/title.txt +++ b/06/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Kebuke 6 -======= -Kebuki 6 : 28 - 58 ->>>>>>> bdecb83ea127cb1be06c9e3bb2420953e3f30a8a +Kebuke 6 \ No newline at end of file diff --git a/10/title.txt b/10/title.txt index cfdca62..5276ee9 100644 --- a/10/title.txt +++ b/10/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Kebuki 10 -======= -Kebuki 10 : 23 - 53 ->>>>>>> bdecb83ea127cb1be06c9e3bb2420953e3f30a8a +Kebuki 10 \ No newline at end of file diff --git a/front/title.txt b/front/title.txt index 5f95f03..e4bb443 100644 --- a/front/title.txt +++ b/front/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Marko -======= -marko ->>>>>>> bdecb83ea127cb1be06c9e3bb2420953e3f30a8a +Marko \ No newline at end of file