From 0f2480f7b21ed452fe1386867c1de839b8f49d60 Mon Sep 17 00:00:00 2001 From: Muzgatama Date: Sun, 6 Dec 2020 19:32:39 +0200 Subject: [PATCH] Sun Dec 06 2020 19:32:39 GMT+0200 (South Africa Standard Time) --- 02/13.txt | 10 +--------- 02/15.txt | 10 +--------- 02/18.txt | 10 +--------- 02/21.txt | 10 +--------- 20/title.txt | 10 +--------- 5 files changed, 5 insertions(+), 45 deletions(-) diff --git a/02/13.txt b/02/13.txt index c13df6c..604afca 100644 --- a/02/13.txt +++ b/02/13.txt @@ -1,9 +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. -======= -<<<<<<< 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. ->>>>>>> 29a87e81af9f8da37cacdc2453a089853fd4c115 ->>>>>>> 6e07b404d3d805dc820f99e16e30673dff196d42 +\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. \ No newline at end of file diff --git a/02/15.txt b/02/15.txt index d94dc71..f6ac437 100644 --- a/02/15.txt +++ b/02/15.txt @@ -1,9 +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." -======= -<<<<<<< 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. ->>>>>>> 29a87e81af9f8da37cacdc2453a089853fd4c115 ->>>>>>> 6e07b404d3d805dc820f99e16e30673dff196d42 +\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 c06ff18..c2e1834 100644 --- a/02/18.txt +++ b/02/18.txt @@ -1,9 +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. -======= -<<<<<<< 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. ->>>>>>> 29a87e81af9f8da37cacdc2453a089853fd4c115 ->>>>>>> 6e07b404d3d805dc820f99e16e30673dff196d42 +\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. \ No newline at end of file diff --git a/02/21.txt b/02/21.txt index 429bf2a..09bad5e 100644 --- a/02/21.txt +++ b/02/21.txt @@ -1,9 +1 @@ -<<<<<<< HEAD -\v 21 Yehovah Mulungu analengesa muntu kuti angone tulo tukulu ndipo mwamuna anangona. Yehovah Mulungu anatenga mbambo imozi ya mwamuna naku valapo pa malo ya tupi pene anatenga Mbambo. \v 22 Na mbabo yamene Yehovah Mulungu anatenga kuli mwamuna anapanga mukazi na kumubwelesa kuli mwamuna. \v 23 Mwamuna akamba " Manje apa, iyi ni bonzo yama bonzo yanga, na tupi ya tupi yanga. Aza itaniwa mukazi chifukwa ana chokela kuli mwamuna." -======= -<<<<<<< HEAD -\v 21 Yehovah Mulungu analengesa muntu kuti angone tulo tukulu ndipo mwamuna anangona. Yehovah Mulungu anatenga mbambo imozi ya mwamuna naku valapo pa malo ya tupi pene anatenga Mbambo. \v 22 Na mbabo yamene Yehovah Mulungu anatenga kuli mwamuna anapanga mukazi na kumubwelesa kuli mwamuna. \v 23 Mwamuna akamba " Manje apa, iyi ni bonzo yama bonzo yanga, na tupi ya tupi yanga. Aza itaniwa mukazi chifukwa ana chokela kuli mwamuna." -======= -\v 21 yehova Mulungu analengesa munthu kuti agone tulo tukulu ndipo mwamuna anagona. Yehova Mulungu anatenga mbambo imozi ya mwamuna naku valapo pa malo ya tupi pamene abatenga mbambo. \v 22 Na mbambo yamene Yehova Mulungu anatenga kuli mwamuna anapanga mukazi na kumubwelesa kuli mwamuna. \v 23 Mwamuna anakamba, "Manje apa, iyi ni bonzo yama bonzo yanga, na tupi ya tupi yanga. Azaitaniwwa mukazi chifukwa anachokela kuli mwamuna." ->>>>>>> 29a87e81af9f8da37cacdc2453a089853fd4c115 ->>>>>>> 6e07b404d3d805dc820f99e16e30673dff196d42 +\v 21 yehova Mulungu analengesa munthu kuti agone tulo tukulu ndipo mwamuna anagona. Yehova Mulungu anatenga mbambo imozi ya mwamuna naku valapo pa malo ya tupi pamene abatenga mbambo. \v 22 Na mbambo yamene Yehova Mulungu anatenga kuli mwamuna anapanga mukazi na kumubwelesa kuli mwamuna. \v 23 Mwamuna anakamba, "Manje apa, iyi ni bonzo yama bonzo yanga, na tupi ya tupi yanga. Azaitaniwwa mukazi chifukwa anachokela kuli mwamuna." \ No newline at end of file diff --git a/20/title.txt b/20/title.txt index e9ab94f..dd3f9ba 100644 --- a/20/title.txt +++ b/20/title.txt @@ -1,9 +1 @@ -<<<<<<< HEAD -Genesis 20 -======= -<<<<<<< HEAD -Mutu 20 -======= -Genesis 20 ->>>>>>> 29a87e81af9f8da37cacdc2453a089853fd4c115 ->>>>>>> 6e07b404d3d805dc820f99e16e30673dff196d42 +Mutu 20 \ No newline at end of file