From ad3e23348d1d92206b43045e71ff5daa566bc41c Mon Sep 17 00:00:00 2001 From: Bshop2 Date: Mon, 30 Nov 2020 13:51:38 +0200 Subject: [PATCH] Mon Nov 30 2020 13:51:37 GMT+0200 (South Africa Standard Time) --- 02/07.txt | 6 +----- 02/09.txt | 6 +----- 02/11.txt | 6 +----- 02/13.txt | 6 +----- 02/15.txt | 6 +----- 02/18.txt | 6 +----- 6 files changed, 6 insertions(+), 30 deletions(-) diff --git a/02/07.txt b/02/07.txt index 79a02db..dfa4512 100644 --- a/02/07.txt +++ b/02/07.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 7 Yehova Mulungu anapanga muntu kuchokela ku doti yapansi, ndipo anamupemela mumpuno mpempo ya umoyo ndiponso muntu anankala wamoyo. \v 8 Yehova Mulungu anashanga munda ku maba mu eden ndipo mwamene muja ana ikamo muntu wamene anapanga. -======= -\v 7 Yehova Mulungu anapanga munthu kuchokela ku doti yapansi, ndipo anamupemela mumpuno mpepo ya umoyo ndiponso munthu anankala wamoyo. \v 8 Yehova Mulungu anashanga munda ku maba mu Eden ndipo mwamene muja anaikamo munthu wamene anapanga. ->>>>>>> 7a79267a77af7f9feb11be346fc9d6fc7cab8456 +\v 7 Yehova Mulungu anapanga munthu kuchokela ku doti yapansi, ndipo anamupemela mumpuno mpepo ya umoyo ndiponso munthu anankala wamoyo. \v 8 Yehova Mulungu anashanga munda ku maba mu Eden ndipo mwamene muja anaikamo munthu wamene anapanga. \ No newline at end of file diff --git a/02/09.txt b/02/09.txt index 990017f..eb59e41 100644 --- a/02/09.txt +++ b/02/09.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 9 Kuchokela kudoti yapasi Yehova Mulungu analengesa mutengo ulionse ku kula zo oneka ku menso ndipo za bwino kudya. Kufakilako na mutengo wa moyo unali pakati pa munda, ndipo na mutengo wa kuziwa chabwino na choipa. \v 10 Mumana unachokela mu eden kutila munda. Kuchokela ado, unagabikana ndipo unankala mumana zili fo. -======= -\v 9 Kuchokela kudoti yapansi yehova Mulungu analengasa mutengo uli onse ku kula zo oneka ku menso ndipo za bwino kudya. kufakilamo na mutengo na mutenga wa kuziwa chabwino na choipa. \v 10 Mumana unachikela mu Eden kutila munda. Kuchikela apo unamabikana ndipo unankala mimana zili 4. ->>>>>>> 7a79267a77af7f9feb11be346fc9d6fc7cab8456 +\v 9 Kuchokela kudoti yapasi Yehova Mulungu analengesa mutengo ulionse ku kula zo oneka ku menso ndipo za bwino kudya. Kufakilako na mutengo wa moyo unali pakati pa munda, ndipo na mutengo wa kuziwa chabwino na choipa. \v 10 Mumana unachokela mu eden kutila munda. Kuchokela ado, unagabikana ndipo unankala mumana zili fo. \ No newline at end of file diff --git a/02/11.txt b/02/11.txt index e16d9de..a72d3c7 100644 --- a/02/11.txt +++ b/02/11.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 11 Zina ya mumana oyamba ni Pishon, ndiye yamene iyenda ku malo yonse ya Havilah kwamene kuli Golide. \v 12 Golide ya pa malo paja niya bwino. Pamalo paliko na Bdellium na mwala wa Onikisi. -======= -\v 11 Zina ya mumana oyamba ni Pishoni, ndiye yamene iyenda ku malo yonse ya Havilah, kwamene kuli golide. \v 12 Golide ya pa malo paja niya bwino. Pamalo paliko na bdellium na mwala wa onikisi. ->>>>>>> 7a79267a77af7f9feb11be346fc9d6fc7cab8456 +\v 11 Zina ya mumana oyamba ni Pishon, ndiye yamene iyenda ku malo yonse ya Havilah kwamene kuli Golide. \v 12 Golide ya pa malo paja niya bwino. Pamalo paliko na Bdellium na mwala wa Onikisi. \ No newline at end of file diff --git a/02/13.txt b/02/13.txt index 5dd9735..5160c54 100644 --- a/02/13.txt +++ b/02/13.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 13 Zina ya mumana wa chibili ni Gihoni. Weve uyenda mu malo yonse ya kushi. \v 14 Zina ya mumana wachitatu ni Tigirisi, ndipo uyenda ku maba kwa Ashuri mumana wa namba fo ni Euferetesi. -======= -\v 13 Zina ya mumana wa chibili ni Gihoni. Weve uyenda mu malo yonse ya kushi. \v 14 Zina ya mumana wa chitatu ni Tigirisi, ndipo uyenda ku maba kwa Asuri mumana wa namba 4 ni Euferetesi. ->>>>>>> 7a79267a77af7f9feb11be346fc9d6fc7cab8456 +\v 13 Zina ya mumana wa chibili ni Gihoni. Weve uyenda mu malo yonse ya kushi. \v 14 Zina ya mumana wachitatu ni Tigirisi, ndipo uyenda ku maba kwa Ashuri mumana wa namba fo ni Euferetesi. \ No newline at end of file diff --git a/02/15.txt b/02/15.txt index 4b86f32..f6ac437 100644 --- a/02/15.txt +++ b/02/15.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 15 Yehovah Mulungu unatenga mwamuna naku muika mu munda wa Edeni kuti azisebenzamo naku sungamo. \v 16 Yehova Mu analamulila mwamuna, kuti, " Ndiwe omasuka kudya kuli mutengo uli onse wa m'munda. \v 17 Koma kuchokela mu mutengo oziba vabwino na voipa osadya, chifukwa siku yamene uzakadyako, zoona zoona uzaka mwalila." -======= -\v 15 Yehova Mulungu anatenga mwamuna naku muika mu munda wa Eden kuti azisebenzamo naku sungamo. \v 16 Yehova Mulungu mwamuna, kuti, "ndiwe omasuka kudya kuli mutengo uli onse wa munda. \v 17 Koma kuchokela mu mutengo oziba vabwino na voipa osadya chifukwa siku yamene uzakadyaako, zoona zoona uzaka mwalila. ->>>>>>> 7a79267a77af7f9feb11be346fc9d6fc7cab8456 +\v 15 Yehovah Mulungu unatenga mwamuna naku muika mu munda wa Edeni kuti azisebenzamo naku sungamo. \v 16 Yehova Mu analamulila mwamuna, kuti, " Ndiwe omasuka kudya kuli mutengo uli onse wa m'munda. \v 17 Koma kuchokela mu mutengo oziba vabwino na voipa osadya, chifukwa siku yamene uzakadyako, zoona zoona uzaka mwalila." \ No newline at end of file diff --git a/02/18.txt b/02/18.txt index 41d8634..9c6f4e2 100644 --- a/02/18.txt +++ b/02/18.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 18 Ndipo Yehovah Mulungu anakamba, " Sichabwino kuti mwamuna ankale Eka. Niza mupangila omutandiza omu wamila." \v 19 Kuchokela ku doti, Yehovah Mulungu anapanga nyama zonse zamuziko na nyoni zonse za mumwamba. Ndipo anavibwelesa kuli muntu kuona vamene azaviyitana chili chonse chamene muntu anaitana chilengedwe chaimoyo chili chonse, yamene iyo yenze zina. \v 20 Muntu anapasa mazina ku vobeta vonse, ku kuinyoni zonse za mumwamba, ndipo naku nyama zonse zammu zanga. Koma kuli mwamuna eve kunalibe anapezeka omutandiza omulinga. -======= -\v 18 Ndipo Yehova Mulungu anakamba, "sichabwino kuti mwamuna ankale eka. Nizamupangila omutundiza omu wamila." \v 19 Kuchokela ku ooti, Yehova Mulungu anapanga nyama zonse zamuziko na nyoni zonse za mumwamba. Ndipo anavibwelesa kuli munthukuona vamene azaviyitana. chili chonse chamene munthu annaitana chilengedwe chai moyo chili chonse, yamene iyo yenze zina. \v 20 Munthu anapasa mazina ku vobeta vonse, ku nyoni zinse za mumwamba, ndipo naku nyama zonse zamu sanga. Koma kuli mwamuna eve kanalibe anapezeka omutandiza umilinga. ->>>>>>> 7a79267a77af7f9feb11be346fc9d6fc7cab8456 +\v 18 Ndipo Yehovah Mulungu anakamba, " Sichabwino kuti mwamuna ankale Eka. Niza mupangila omutandiza omu wamila." \v 19 Kuchokela ku doti, Yehovah Mulungu anapanga nyama zonse zamuziko na nyoni zonse za mumwamba. Ndipo anavibwelesa kuli muntu kuona vamene azaviyitana chili chonse chamene muntu anaitana chilengedwe chaimoyo chili chonse, yamene iyo yenze zina. \v 20 Muntu anapasa mazina ku vobeta vonse, ku kuinyoni zonse za mumwamba, ndipo naku nyama zonse zammu zanga. Koma kuli mwamuna eve kunalibe anapezeka omutandiza omulinga. \ No newline at end of file