From 81d04e79f494112067d4e2c620dec92b7b45e304 Mon Sep 17 00:00:00 2001 From: lversaw Date: Fri, 16 Jun 2017 09:54:43 -0600 Subject: [PATCH] Fri Jun 16 2017 09:54:42 GMT-0600 (Mountain Daylight Time) --- 01/06.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/01/06.txt b/01/06.txt index 8b7c0afa..b6a825fa 100644 --- a/01/06.txt +++ b/01/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 Aha ka bena hantu honke mpaho shiba mubuza, Nfumu, eyi nje nako no booze o mubuso wa Isilaere?" \v 7 Aku bata ye, "Oku taye muzyibe e nako kapa e myaka kali nzenu kuta ye muzyibe eyo na toma Tata ko bubusi bwakwe." \v 8 Kono mura tambura maata, o Ruho ru Chnete aho neru kezye kwenu, mi mura ba e mpanki zangu mwa Jerusalema nimwa nimwa Judea yonshe ne Samaria, noku ma manikizo efasi." -======= -P ->>>>>>> dee8b5617b961eec4643b50b0392098b01c1e2f6 +\v 6 Aha ka bena hantu honke mpaho shiba mubuza, Nfumu, eyi nje nako no booze o mubuso wa Isilaere?" \v 7 Aku bata ye, "Oku taye muzyibe e nako kapa e myaka kali nzenu kuta ye muzyibe eyo na toma Tata ko bubusi bwakwe." \v 8 Kono mura tambura maata, o Ruho ru Chnete aho neru kezye kwenu, mi mura ba e mpanki zangu mwa Jerusalema nimwa nimwa Judea yonshe ne Samaria, noku ma manikizo efasi." \ No newline at end of file