Thu Mar 07 2024 13:25:10 GMT+0800 (Taipei Standard Time)

01/01.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-This is Chuck typing in this chunk.
-=======
-\c 1 \v 1 Tabea waki si Yakobus, hamba ni Empung wo ni Tuhan Yesus Kristus, wia se mapulu’ o rua suku waki pasengkotan. \v 2 Patuariku waya, papokeiy mola tanume e nesa ka’aruiyan, sakawisa kouw i kawolon witu e reiy’ sa mina’asa pewa’awa’an, \v 3 karengan nikouw kouw mete’u, kaa e nujian witu e imanmu i ti’i e minua’la katenteman.
->>>>>>> 8886679b9322d60ce3c41cc87b0de86d4f382830
+\c 1 \v 1 Tabea waki si Yakobus, hamba ni Empung wo ni Tuhan Yesus Kristus, wia se mapulu’ o rua suku waki pasengkotan. \v 2 Patuariku waya, papokeiy mola tanume e nesa ka’aruiyan, sakawisa kouw i kawolon witu e reiy’ sa mina’asa pewa’awa’an, \v 3 karengan nikouw kouw mete’u, kaa e nujian witu e imanmu i ti’i e minua’la katenteman.

01/04.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 4 HI!  This Sherly !   \v 5 Today is a great day!  Donald is a good tech.
-=======
-\v 4 Wo i waya mola eng katenteman i ti’i  maka’ato  wu’ana  wowos, rio kouw mamuali  reiy’ siperoan wo lekep wo  reiy’ sikinakurangan  sapa i te tu’u. \v 5 Ta’an sakawisa witu e nelet miouw  wawean sikinakurangan hikmat, satorona nisia si makiweela  nyi’a wia si Empung, – si mineela wia em baya ne tou ampit e mura ate wo ampit e reiy’ mebangki-bangkil –, takar eng kapualitan i ti’i e laa i weela wia nisia.
->>>>>>> 8886679b9322d60ce3c41cc87b0de86d4f382830
+\v 4 Wo i waya mola eng katenteman i ti’i  maka’ato  wu’ana  wowos, rio kouw mamuali  reiy’ siperoan wo lekep wo  reiy’ sikinakurangan  sapa i te tu’u. \v 5 Ta’an sakawisa witu e nelet miouw  wawean sikinakurangan hikmat, satorona nisia si makiweela  nyi’a wia si Empung, – si mineela wia em baya ne tou ampit e mura ate wo ampit e reiy’ mebangki-bangkil –, takar eng kapualitan i ti’i e laa i weela wia nisia.