diff --git a/06/45.txt b/06/45.txt index b7274a1..affe865 100644 --- a/06/45.txt +++ b/06/45.txt @@ -1,7 +1,3 @@ -<<<<<<< HEAD -\v 45 Limbas je, Yesus palus memerintah murid-muirid-Ah mandai guang kalotok umba buhau nyahelu-Iye guang silan, guang Betsaida ,pandehan Iye manyuhi lai are je buhau. \v 46 Limbas laku izin umba ise, Iye buhau guang bukit akan berdoa. \v 47 Metuh tukep hamalem,kalotok je betuk danau umba Yesus kabuat jung ambu petak. -======= \v 45 Limbas je, Yesus palus memerintah murid-muirid-Ah mandai guang kalotok umba buhau nyahelu-Iye guang silan, guang Betsaida, pandehan Iye manyuhi ulun are je buhau. -\v 46 Limbas laku izin umba ise, Iye buhau guang bukit akan berdoa. -\v 47 Metuh tukep hamalem, kalotok je betuk danau umba Yesus kabuat jung ambu petak. ->>>>>>> 5f4da2a5f55cdae602465ab52dcacdbd6ebf4f2e + \v 46 Limbas laku izin umba ise, Iye buhau guang bukit akan berdoa. + \v 47 Metuh tukep hamalem, kalotok je betuk danau umba Yesus kabuat jung ambu petak. \ No newline at end of file diff --git a/06/48.txt b/06/48.txt index 60c1537..9666d45 100644 --- a/06/48.txt +++ b/06/48.txt @@ -1,11 +1,4 @@ -<<<<<<< HEAD -Metuh tukep hamalem,kalotok je betuk danau umba Yesus kabuat jung ambu petak. -\v 48 Umba, limbas nampayah murid-murid-Ah -mambesei dengan bahali payah hawi riwut malawan arah umba ise, kira-kira sakitar jam jaga hamalem kaepat, Yesus guang ise umba mananjung jung ambu danau umba Iye handak nanjung nakalau ise. -\v 49 akan tetapi, metuh ise napayah Yesus nanjung jung ambu danau, ise nyangka bahwa Iye adalah kambe, limbas je ise ngombak, -======= -\v 48 \v 48 Umba, limbas nampayah murid-murid-Ah +\v 48 48 Umba, limbas nampayah murid-murid-Ah mambesei dengan bahali payah hawi riwut malawan arah umba ise, kira-kira sakitar jam jaga hamalem kaepat, Yesus guang ise umba mananjung jung ambu danau umba Iye handak nanjung nakalau ise. \v 49 Akan tetapi, metuh ise napayah Yesus nanjung jung ambu danau, ise nyangka bahwa Iye adalah kambe, limbas je ise ngombak, ->>>>>>> 5f4da2a5f55cdae602465ab52dcacdbd6ebf4f2e -\v 50 Hawi ise uras payah Yesus umba mikeh. + \v 50 Hawi ise uras payah Yesus umba mikeh. Tapi, Yesus langsung pander umba ise, umba bapander umba ise, "Tenang ih. jituh Aku! Ela mikeh." \ No newline at end of file diff --git a/06/51.txt b/06/51.txt index 1417349..06d77bf 100644 --- a/06/51.txt +++ b/06/51.txt @@ -1,7 +1,3 @@ \v 51 Limbas je, Iye naker umba ise guang kalotok, umba riwutpun tende, ise pun sangat takjub. -<<<<<<< HEAD -\v 52 Hawi, ise masih hindai mamahami tentang mukjizat-mukjizat lime wadai jije hawi ise masih manekang atei se. Yesus paamat Lai are -======= -\v 52 Hawi, ise masih hindai mamahami tentang mukjizat-mukjizat lime wadai jije hawi ise masih manekang atei se. -Yesus paamat Lai are ->>>>>>> 5f4da2a5f55cdae602465ab52dcacdbd6ebf4f2e + \v 52 Hawi, ise masih hindai mamahami tentang mukjizat-mukjizat lime wadai jije hawi ise masih manekang atei se. +Yesus paamat Lai are \ No newline at end of file diff --git a/06/53.txt b/06/53.txt index a1714b7..afd0f5d 100644 --- a/06/53.txt +++ b/06/53.txt @@ -1,8 +1,2 @@ -<<<<<<< HEAD \v 53 Umba, limbas Yesus umba murid-murid-Ah pasilan, ise mandarat jung petak Genesaret umba balabuh. \v 54 Metuh, muhun bara kalotok, ulun-ulun nyalenga mangenal Yesus, \v 55 umba hadari guang uras daerah jije umba mulai ngaya ulun -ulun pehe jung ambu tilam, ise mahening tentang -======= -\v 53 Umba, limbas Yesus umba murid-murid-Ah pasilan, ise mandarat jung petak Genesaret umba balabuh. -\v 54 Metuh, muhun bara kalotok, ulun-ulun nyalenga mangenal Yesus, -\v 55 umba hadari guang uras daerah jije umba mulai ngaya ulun -ulun pehe jung ambu tilam, ise mahening tentang ->>>>>>> 5f4da2a5f55cdae602465ab52dcacdbd6ebf4f2e keberadaan Yesus. \ No newline at end of file diff --git a/13/title.txt b/13/title.txt new file mode 100644 index 0000000..e3c7a70 --- /dev/null +++ b/13/title.txt @@ -0,0 +1 @@ +pasal 3 \ No newline at end of file diff --git a/manifest.json b/manifest.json index dd7099b..64403ed 100644 --- a/manifest.json +++ b/manifest.json @@ -78,6 +78,10 @@ "04-40", "05-title", "06-title", + "06-45", + "06-48", + "06-51", + "06-53", "06-56", "07-title", "07-01", @@ -185,6 +189,7 @@ "12-38", "12-41", "12-43", + "13-title", "13-01", "13-03", "13-05",