diff --git a/07/01.txt b/07/01.txt index b656221..6f9f728 100644 --- a/07/01.txt +++ b/07/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 7 \v 1 Baada ama Yesu udaha muintu narewavaera gwa antu nevamoghembie, wakea Kapernaumu. -======= -\v 1 Baada ama Yesu udaha muintu narewavaera gwa antu nevamoghembie, wakea Kapernaumu. ->>>>>>> 18dc89741972e14b21b9a47671c402dfed1ab521 +\c 7 \v 1 Baada ama Yesu udaha muintu narewavaera gwa antu nevamoghembie, wakea Kapernaumu. \ No newline at end of file diff --git a/07/02.txt b/07/02.txt index 151cc4b..ed3e391 100644 --- a/07/02.txt +++ b/07/02.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 \v 5 \v 2 Motromwa fulani wa akida, nare wina ujaa ino gune mweso,na moremu ino nanare wahuvea ukuya. \v 3 Lakini narewatregheya uhusu Yesu -======= -\v 2 Motromwa fulani wa akida, nare wina ujaa ino gune mweso,na moremu ino nanare wahuvea ukuya. \v 3 Lakini narewatregheya uhusu Yesu, Akida usuu agamotroma motrongeri wa geyahudi, umuomba aje muchoa motromwa wakwe ili atrakuye. \v 4 Nare vaghea fife na Yesu, vegamoseya gwa ino na vamwera, "ustahili kwamba useghetwe uhende vii gwa soko akwe, \v 5 gwa soko nereyanjetre itaifa rane, na ndio newajengie isinagogi gwa soko itru". ->>>>>>> 18dc89741972e14b21b9a47671c402dfed1ab521 +\v 2 Motromwa fulani wa akida, nare wina ujaa ino gune mweso,na moremu ino nanare wahuvea ukuya. \v 3 Lakini narewatregheya uhusu Yesu, Akida usuu agamotroma motrongeri wa geyahudi, umuomba aje muchoa motromwa wakwe ili atrakuye. \v 4 Nare vaghea fife na Yesu, vegamoseya gwa ino na vamwera, "ustahili kwamba useghetwe uhende vii gwa soko akwe, \v 5 gwa soko nereyanjetre itaifa rane, na ndio newajengie isinagogi gwa soko itru". \ No newline at end of file diff --git a/07/title.txt b/07/title.txt index 6ea6f1f..db53dba 100644 --- a/07/title.txt +++ b/07/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Usambi wa 7 -======= -Usambi 7 ->>>>>>> 18dc89741972e14b21b9a47671c402dfed1ab521 +Usambi 7 \ No newline at end of file diff --git a/13/06.txt b/13/06.txt index 29c2742..aaabfbf 100644 --- a/13/06.txt +++ b/13/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 Yesu akavakhania ndolio iyii, "Muntu umwedu newina mtini wafandiee u mughunda wakwe ma akaenda u mughunda wakwe ufenja mbisya nyeso atrinahangaa. \v 7 Wamukhania munyotunza bustani, 'Rava gwa miakha itatru najaa ufenja mbisya u mutini nyeso ntinahanga. Wuutreme. Uguruvanga fangi? -======= -\v 6 Yesu akavakhania ndolio iyii, "Muntu umwedu newina mtini wafandiee u mughunda wakwe ma akaenda u mughunda wakwe ufenja mbisya nyeso atrinahangaa. \v 7 Wamukhania munyotunza bustani, 'Rava gwa miakha itatru najaa ufenja mbisya u mutini nyeso ntinahanga. Wuutreme. Uguruvanga fang'i. ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\v 6 Yesu akavakhania ndolio iyii, "Muntu umwedu newina mtini wafandiee u mughunda wakwe ma akaenda u mughunda wakwe ufenja mbisya nyeso atrinahangaa. \v 7 Wamukhania munyotunza bustani, 'Rava gwa miakha itatru najaa ufenja mbisya u mutini nyeso ntinahanga. Wuutreme. Uguruvanga fangi? \ No newline at end of file diff --git a/13/08.txt b/13/08.txt index a634d70..e5b9239 100644 --- a/13/08.txt +++ b/13/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Mtunza bustani akajibu wahanya, 'Ureke mwakha urui uno niufarie ija na utrendea mbolea. \v 9 Unoo niwafafa mbisya mwakha niujie, ni guja; nyeso niwadia ufafa wuutreme!" -======= -\v 8 Mtunza bustani akajibu wahanya, 'Ureke mwakha urui uno niufarie ija na utrendea mbolea. \v 9 Unoo niwafafa mbisya mwakha niujie, ni guja; nyeso niwadia ufafa wuutreme". ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\v 8 Mtunza bustani akajibu wahanya, 'Ureke mwakha urui uno niufarie ija na utrendea mbolea. \v 9 Unoo niwafafa mbisya mwakha niujie, ni guja; nyeso niwadia ufafa wuutreme!" \ No newline at end of file diff --git a/13/18.txt b/13/18.txt index 290f5cc..f4adb81 100644 --- a/13/18.txt +++ b/13/18.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 18 Yesu akahanya, "Utremi wa Mungu ugikhwetre na ntuni na nudaha uwiikhoya nantuni? \v 19 Ginya mbeyu a haradani neakamihoa muntu umwedu wafandia u mughunda wakwe, unoo akinda atrendeka mutri ukuu, na nyonyi ya girunde ikajenga irurio yawe u masanja ayo. -======= -\v 18 Yesu akahanya, "Utremi wa Mungu ugikhwetre na ntuni na nudaha uwiikhoya nantuni? \v 19 Ginya mbeyu a haradani neakamihoa muntu umwedu wafandia u mughunda wakwe, unoo akinda atrendeka mutri ukuu, na nyonyi ya girunde ikajenga irurio yawe u masanja ayo". ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\v 18 Yesu akahanya, "Utremi wa Mungu ugikhwetre na ntuni na nudaha uwiikhoya nantuni? \v 19 Ginya mbeyu a haradani neakamihoa muntu umwedu wafandia u mughunda wakwe, unoo akinda atrendeka mutri ukuu, na nyonyi ya girunde ikajenga irurio yawe u masanja ayo. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 6f82301..dc96397 100644 --- a/manifest.json +++ b/manifest.json @@ -173,6 +173,9 @@ "06-45", "06-46", "06-49", + "07-title", + "07-01", + "07-02", "07-06", "07-09", "07-11", @@ -309,10 +312,13 @@ "13-title", "13-01", "13-04", + "13-06", + "13-08", "13-10", "13-12", "13-15", "13-17", + "13-18", "13-22", "13-25", "13-31",