From f4836933f69a6626e8a7b64b569f467c93646462 Mon Sep 17 00:00:00 2001 From: dayakkalis Date: Fri, 14 Sep 2018 11:17:44 +0700 Subject: [PATCH] Fri Sep 14 2018 11:17:42 GMT+0700 (SE Asia Standard Time) --- 04/19.txt | 6 +----- 06/07.txt | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/04/19.txt b/04/19.txt index b9dbc04..5097c83 100644 --- a/04/19.txt +++ b/04/19.txt @@ -1,6 +1,2 @@ \v 19 Tapi Petrus dan Yohanes manyaut dan loloa' ndi ira tuu, " lao'ang mang ai totongen lam salikan na Sampulo ' mandalingga diken dai pada mandalingga Sampilo? -<<<<<<< HEAD - \v 20 Beakam ngule' kituu' bea loloa' yang kita dalingaen lenam. -======= -\v 20 Beakam ngule' kituu' bea loloa' yang kita dalingaen lenam. ->>>>>>> 4ef179ef03ac6748fa48bd93692d5816813ea4db + \v 20 Beakam ngule' kituu' bea loloa' yang kita dalingaen lenam. \ No newline at end of file diff --git a/06/07.txt b/06/07.txt index fbb8e0c..ad9f5b3 100644 --- a/06/07.txt +++ b/06/07.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 7 Dongo Kunyanyik maken dao' tadongo, maken bom uluanan (umat) sang (makin) ambat. labi dai tu jien kon Imam maolak mandi iman tu en. -======= -\v 7 Dongo Kunyanyik maken dao' tadongo, maken bom uluanan (umat) sang (makin) ambat. labi dai tu jien kon Imam maolak mandi iman tu en. ->>>>>>> 4ef179ef03ac6748fa48bd93692d5816813ea4db +\v 7 Dongo Kunyanyik maken dao' tadongo, maken bom uluanan (umat) sang (makin) ambat. labi dai tu jien kon Imam maolak mandi iman tu en. \ No newline at end of file