From e51b54fe32e66036953ace42246080995a01d986 Mon Sep 17 00:00:00 2001 From: dayaklaur Date: Sat, 5 May 2018 23:08:09 -0700 Subject: [PATCH] Sat May 05 2018 23:08:07 GMT-0700 (Pacific Daylight Time) --- 10/03.txt | 6 +----- manifest.json | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/10/03.txt b/10/03.txt index 7730df9f..6c0b6feb 100644 --- a/10/03.txt +++ b/10/03.txt @@ -1,6 +1,2 @@ -<<<<<<< HEAD \v 3 Pado sore,sekitar jam tigo ari nyin te, io nongan secaro jolas delom sebuah penonganan, seurank malekat Allah detank kan bekato ke io, -"Kornelius!" \v 4 Lalu, io encelomat malekat nyin kan sawan kan bekato,"Ope mo tuk, duen?" Kan malekat nyin bekato ke io,"Doa-doa kau kan panulunk kau dah neit nyedi suatu pengigat di adopan Allah. \v 5 Sa'at tuk,suruh'a urank ke Yope kan sapo'am seurank bedemo Simon, yo gak di sapo Petrus, \v 6 io tinggel besamo kan penyamak kulit bedemo Simon, yo umah'a beado di topi laut." -======= -\v 4 \v 5 \v 6 3\v 3 ->>>>>>> 0b7595869ca0fd3db38ec88a7a1a1bbe75101415 +"Kornelius!" \v 4 Lalu, io encelomat malekat nyin kan sawan kan bekato,"Ope mo tuk, duen?" Kan malekat nyin bekato ke io,"Doa-doa kau kan panulunk kau dah neit nyedi suatu pengigat di adopan Allah. \v 5 Sa'at tuk,suruh'a urank ke Yope kan sapo'am seurank bedemo Simon, yo gak di sapo Petrus, \v 6 io tinggel besamo kan penyamak kulit bedemo Simon, yo umah'a beado di topi laut." \ No newline at end of file diff --git a/manifest.json b/manifest.json index 15189043..d808a312 100644 --- a/manifest.json +++ b/manifest.json @@ -184,6 +184,7 @@ "09-40", "10-title", "10-01", + "10-03", "10-07", "10-09", "10-13",