Mon Nov 30 2020 13:54:46 GMT+0200 (South Africa Standard Time)

31/07.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 7 Batate banu baninama na kucinja malipilo yanga kali 10, koma Mulungu sana muvomeka kucita coipa. \v 8 Ngati anakamba kuti, nyama za manthongo ndiye malipiro yako, 'ndipo zonse nyama zinabala  zamanthongo, ngati akamba kuti, zamizela zizakhala malipiro yako, ' ndipo nyama zonse zinabala zamizera. \v 9 Cifukwa cake Mulungu anatenga nyama za batate banu na ni pasa.
-=======
-\v 7 Batate banu baninama na kucinja malipilo yanga kali 10, koma Mulungu sana muvomele kucita coipa. \v 8 Ngati anakmba kuti, nyama zama mphongo ndiye malipilo yako, 'ndipo zonse nyama zinabala nyama za mamphongo, ngati akamba kuti, zamizela zizankhala malipilo bako,' ndipo nyama zonse zinabala zamizela. \v 9 Cifukwa cake Muklungu anatenga nyama za batate banu na kunipasa.
->>>>>>> 7a79267a77af7f9feb11be346fc9d6fc7cab8456
+\v 7 Batate banu baninama na kucinja malipilo yanga kali 10, koma Mulungu sana muvomeka kucita coipa. \v 8 Ngati anakamba kuti, nyama za manthongo ndiye malipiro yako, 'ndipo zonse nyama zinabala  zamanthongo, ngati akamba kuti, zamizela zizakhala malipiro yako, ' ndipo nyama zonse zinabala zamizera. \v 9 Cifukwa cake Mulungu anatenga nyama za batate banu na ni pasa.

31/10.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 10 Ndipo pa nthawi yobala, ninaona muciloto mbuzi zimuna zinali kukwra nyama. Mbuzi zimuna zinali namizera, namanthongo na mitundu yosiyana siyana. \v 11 Mungelo wa Mulungu anakamba naine muciloto, 'Yakobo,' nakamba,' 'Ine nilipano.'
-=======
-\v 10 ndipo pa nthawi yobala, ninaona muciloto mbuzi zimuna zinali kukwela nyama. Mbuzi zimuna zinali namizela, na mamphongo na mitundu yosiyana-siyana. \v 11 Mungelo wa Mulungu anakamba na ine mu ciloto, 'Yakobo' ninakamba, 'nili pano.'
->>>>>>> 7a79267a77af7f9feb11be346fc9d6fc7cab8456
+\v 10 ndipo pa nthawi yobala, ninaona muciloto mbuzi zimuna zinali kukwela nyama. Mbuzi zimuna zinali namizela, na mamphongo na mitundu yosiyana-siyana. \v 11 Mungelo wa Mulungu anakamba na ine mu ciloto, 'Yakobo' ninakamba, 'nili pano.'

31/12.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 12 Anakamba, 'Nyamula menso yaku ndipo uone mbuzi zonse zimuna zikwerana na nyama. Zinamizela, Manthongo, na mitundu yosiyanasiyana, cifukwa nabona vonse vamene Labani acita kuli iwe. \v 13 Ndine  Mulungu wa Betele, kwamene Mathira mafuta pamwala, kwamene unalumbilila kuli ine. Manje nyamuka ucoke m,malo yano ndi  kubwelera kumalo kwamene unabadwira.'"
-=======
-\v 12 Anakamba kuti, nyamula menso yako ndipo uone mbuzi zonse zimuna zikwelana na nyama. Zinamizela mamphongo, na mitundu yosina-siyana, cifukwa naona vonse vamene Labani acita kuli iwe. Ndine \v 13 Mulungu wa Betele, kwamene unathila mafuta pamwala, kwamene unalumbila kuli ine. Manje nyamuka ucoke m'malo yano na kubwelela kumalo kwamene unabdwila."
->>>>>>> 7a79267a77af7f9feb11be346fc9d6fc7cab8456
+\v 12 Anakamba kuti, nyamula menso yako ndipo uone mbuzi zonse zimuna zikwelana na nyama. Zinamizela mamphongo, na mitundu yosina-siyana, cifukwa naona vonse vamene Labani acita kuli iwe. Ndine \v 13 Mulungu wa Betele, kwamene unathila mafuta pamwala, kwamene unalumbila kuli ine. Manje nyamuka ucoke m'malo yano na kubwelela kumalo kwamene unabdwila."

31/14.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 14 Rakele ndi Leya anayankha ndi ku kamba  nayeve, kodi kulibe gao na vosalira vanthu munyuma yatate? \v 15 Kodi sitisungiwa na yeve monga ba lendo? cifukwa atigulisa na kusilizilatu kuononga ndala zathu. \v 16 Pa cuma conse camene Mulungu acosaka kuli batate bthu cankuala cathu na bana bathu. Manje, vilivonse vamene Mulungu akamba, cita."
-=======
-\v 14 Rakele na Leya anayankha na kukamba na eve, nanga kulibe mbali na vosalila vathu munyumba ya batate? \v 15 Sitisungiwa na eve monga ni balendo?cifukwa atigulisa nakuonongeltu nadalama zathu. \v 16 Pa cuma ciliconse camene bacosako kuli batate bathu cankhala cathu na bana bathu. Manje, vilivonse vamene Mulungu akamba,  cita."
->>>>>>> 7a79267a77af7f9feb11be346fc9d6fc7cab8456
+\v 14 Rakele na Leya anayankha na kukamba na eve, nanga kulibe mbali na vosalila vathu munyumba ya batate? \v 15 Sitisungiwa na eve monga ni balendo?cifukwa atigulisa nakuonongeltu nadalama zathu. \v 16 Pa cuma ciliconse camene bacosako kuli batate bathu cankhala cathu na bana bathu. Manje, vilivonse vamene Mulungu akamba,  cita."

31/17.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 17 Ndipo Yakobo ananyamuka noika bana bake bamuna na bazikazi bake pa ma bulu. \v 18 Anaika zobeta zake pa songolo pake, pamozi nakatundu wake bonse, kuikilapo nanyama za mene anakhala nazo mu paddani Aramu. Ndipo anakonzekera kuyenda kuli Isaki tate wake mumalo yao ya Kanaani.
-=======
-\v 17 \v 18 Ndipo Yakobo anayamuka noika bana bake bamuna na bakazi bake pa ngamila
->>>>>>> 7a79267a77af7f9feb11be346fc9d6fc7cab8456
+\v 17 Ndipo Yakobo ananyamuka noika bana bake bamuna na bazikazi bake pa ma bulu. \v 18 Anaika zobeta zake pa songolo pake, pamozi nakatundu wake bonse, kuikilapo nanyama za mene anakhala nazo mu paddani Aramu. Ndipo anakonzekera kuyenda kuli Isaki tate wake mumalo yao ya Kanaani.