From a50f9625490786359a1fdb3132ca13231f8b4499 Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Sun, 16 Feb 2020 03:39:23 +0800 Subject: [PATCH] Sun Feb 16 2020 03:39:13 GMT+0800 (China Standard Time) --- 22/01.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/22/01.txt b/22/01.txt index 12ae450..e76aec9 100644 --- a/22/01.txt +++ b/22/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 22 \v 1 Yesua wonusu be amsal tanimara le umon, gal, \v 2 ''Molokut ta samah ze melik tani al jahizu ihtifal ta iris le weled bitou. \v 3 Huwo rasulu khudam bitou ashan bi nadi nas al kan rahibu(wodi le umon dahuwa) ashan bi ja le iris, lakin umon ma ja. -======= -\c 22 \v 1 Tani mara Yesua wanisu le humon amsila, be kelem, \v 2 Al malakut bita samah zee melik al kan nazimu hafula ta eris le jena tou. \v 3 Huwo rasulu kadamim tou kele ruwa nadi nas al mauzumin de humon ja le hafula ta eris, lakin humon maja ->>>>>>> f0eacb0063cbfcb9ec5aa5dcefaf7e17b17e2d72 +\c 22 \v 1 Yesua wonusu be amsal tanimara le umon, gal, \v 2 ''Molokut ta samah ze melik tani al jahizu ihtifal ta iris le weled bitou. \v 3 Huwo rasulu khudam bitou ashan bi nadi nas al kan rahibu(wodi le umon dahuwa) ashan bi ja le iris, lakin umon ma ja. \ No newline at end of file