From b23ad3c0dcf0c68afcf25ce0134fbe28e96cdd9f Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Wed, 19 Feb 2020 08:14:22 +0700 Subject: [PATCH] Wed Feb 19 2020 08:14:21 GMT+0700 (Tomsk Standard Time) --- 03/04.txt | 6 +----- 03/13.txt | 7 +------ manifest.json | 2 ++ 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/03/04.txt b/03/04.txt index 2d250e9..7838f23 100644 --- a/03/04.txt +++ b/03/04.txt @@ -1,6 +1,2 @@ -<<<<<<< HEAD -\v 4 Lahatala e kavasa angu ae nia bung ing ang ebele iini ue vengkarajang sehi bot tarus veng karajang nababa ni metma vengiat mateng angu. \v 5 Aulang base Lahatala iomi ening amolo va ila Lahatala omi metma pijahi, bot va ila Kristus e malea omimi. MALEKANG VENGKARAJANG -======= \v 4 Lahatala e kavasa angu ae nia bung ing ang ebele iini ue vengkarajang sehi bot tarus veng karajang nababa ni metma vengiat mateng angu. \v 5 Aulang base Lahatala iomi ening amolo va ila Lahatala omi metma pijahi, bot va ila Kristus e malea omimi. - MALEKANG VENGKARAJANG ->>>>>>> 4a714ad23a207ca873028d7a1965800c14bb5a4d + MALEKANG VENGKARAJANG \ No newline at end of file diff --git a/03/13.txt b/03/13.txt index 9a4a7fa..df908cc 100644 --- a/03/13.txt +++ b/03/13.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 13 Aulang arunge ne kaku e ne serang eke moleng ekang aung ang vengkarajang m \v 14 Nubaba bae eamulung niang bot nababa ni ae surat omi anga mi veang banang anga nehe angu iini ea uling bot eke at abeta ekang aulang he ana ava aloring. \v 15 Nehe ba aulang angu naung iat tota ekang orang ekang arunge a vomung a pahang metma e kaku e serang ening. HUR EVENG ABANG -======= -\v 13 Aulang arunge ne kaku e ne serang eke moleng ekang aung ang vengkarajang m \v 14 Nubaba bae eamulung niang bot nababa ni ae surat omi anga mi veang banang anga nehe angu iini ea uling bot eke at abeta ekang aulang he ana ava aloring. \v 15 Nehe ba aulang angu naung iat tota ekang orang ekang arunge a vomung a pahang metma e kaku e serang ening. -HUR EVENG ABANG ->>>>>>> 4a714ad23a207ca873028d7a1965800c14bb5a4d +\v 13 Aulang arunge ne kaku e ne serang eke moleng ekang aung ang vengkarajang m \v 14 Nubaba bae eamulung niang bot nababa ni ae surat omi anga mi veang banang anga nehe angu iini ea uling bot eke at abeta ekang aulang he ana ava aloring. \v 15 Nehe ba aulang angu naung iat tota ekang orang ekang arunge a vomung a pahang metma e kaku e serang ening. HUR EVENG ABANG \ No newline at end of file diff --git a/manifest.json b/manifest.json index 8e19fc6..b33e3bb 100644 --- a/manifest.json +++ b/manifest.json @@ -51,8 +51,10 @@ "02-16", "03-title", "03-01", + "03-04", "03-06", "03-10", + "03-13", "03-16" ] } \ No newline at end of file