diff --git a/06/11.txt b/06/11.txt index bd2f6fe..add8c91 100644 --- a/06/11.txt +++ b/06/11.txt @@ -1,15 +1,2 @@ -<<<<<<< HEAD \v 11 Kami tagonang mansing-mansing ikau nunjukkan ketekunan yo samo ntuk punya'ik jaminan pengharapan yo sempurno sampai akhir, \v 12 supayo ikau nang -j'di malas, tetapi nundok'ik teladan urang- urang yo udah waris'ik jenji-jenji Allah nglalu'ik iman kant ketekunan. -======= -\v 12 \v 11 \v11 Kami tagonang masing-masing -ikau nunjukkan ketekunan yo samo ntuk ndepat -jaminan pengharapan yo -jengak sampai -akhir, supayo ikau inang -jedi malas tapi -nundok teladan urang- urang yo udah mewarisi jenji-jenji Allah nglalu iman kan kerajin-a. -Jenji Allah -Com Kolok -berubah ->>>>>>> aec524179653ce0544fb9c190836782409170396 +j'di malas, tetapi nundok'ik teladan urang- urang yo udah waris'ik jenji-jenji Allah nglalu'ik iman kant ketekunan. \ No newline at end of file diff --git a/06/13.txt b/06/13.txt index b320e8c..05782bd 100644 --- a/06/13.txt +++ b/06/13.txt @@ -1,16 +1,2 @@ -<<<<<<< HEAD \v 13 Tengkalo Allah bejenji kepado Abraham, Io bejenji atas dirik-A surang dongah com ado yo lobih bosar d'ripado dirik-A. \v 14 Allah bakato, "Aku pasti akan mberkat'ik kau," kant "Aku pasti akan melipatgandakan keturunan kau." \v 15 Kant, udah -nunggukan ngan saber, Abraham nrimok jenji nyin. -======= -\v 13 \v 15 \v13 Waktu Allah -berjenji kepado Abraham io berjenji atas diri -io sorang kareno -com ado yo lobih. -bosar deri pado. -diri iyo. \v 14 Allah bakato, Aku -pasti akan memberkatikau," -kan"Aku pasti akan melipat gandakan keturunan kau." -\v15 kan udah -nunggu kan saber, Abraham -Nrimok jenji njin. ->>>>>>> aec524179653ce0544fb9c190836782409170396 +nunggukan ngan saber, Abraham nrimok jenji nyin. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 64a4642..31fb06f 100644 --- a/manifest.json +++ b/manifest.json @@ -80,6 +80,8 @@ "06-01", "06-04", "06-07", - "06-09" + "06-09", + "06-11", + "06-13" ] } \ No newline at end of file