Tue Aug 13 2019 09:42:51 GMT+0800 (China Standard Time)

This commit is contained in:
ezar.chandra 2019-08-13 09:42:51 +08:00
parent e46497e0b3
commit ab132e7cbe
2 changed files with 5 additions and 8 deletions

View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 15 Na' Kanaan nya' ama'na Sidon, ana mbodi'na, monno Het. \v 16 Wolla uwa'na Kanaan waddeka, ata Yebusi, ata Amori, ata Gergasi, \v 17 ata Hewi, ata Arki, ata Sini, \v 18 Ata Arwadi, ata Semari, monno ata Hamati. Mba'lengnga pa'mbawa rapa ngarra kuwana ndu'ndadi na Kanaan a' matallara.
=======
\v 15 Na' Kanaan nya' ama'na Sidon, ana mbodi'na, monno Het. \v 16 Wolla uwa'na Kanaan waddeka, ata Yebusi, ata Amori, ata Gergasi, \v 17 Ata Hewi, ata Arki, ata Sini, \v 18 Ata Arwadi, ata Semari, monno ata Hamati. Mba'lengnga pa'mbawa rapa ngarra kuwana ndu'ndadi na Kanaan a' matallara.
>>>>>>> 0ac55dc2389b4c2dcadbf682db6491027f2f5f1f
\v 15 Na' Kanaan nya' ama'na Sidon, ana mbodi'na, monno Het. \v 16 Wolla uwa'na Kanaan waddeka, ata Yebusi, ata Amori, ata Gergasi, \v 17 Ata Hewi, ata Arki, ata Sini, \v 18 Ata Arwadi, ata Semari, monno ata Hamati. Mba'lengnga pa'mbawa rapa ngarra kuwana ndu'ndadi na Kanaan a' matallara.

View File

@ -156,9 +156,13 @@
"10-06",
"10-08",
"10-11",
"10-15",
"10-19",
"10-21",
"10-24",
"10-26",
"10-30",
"10-32",
"11-title",
"11-01",
"11-03",
@ -277,9 +281,6 @@
"41-50",
"41-53",
"41-55",
"10-26",
"10-30",
"10-32",
"42-title",
"42-01",
"42-05"