From aae54ab90bf8046c5b8a97cbe6ddcdda9ccb2893 Mon Sep 17 00:00:00 2001 From: "bahasatech.indobarat" Date: Wed, 17 May 2023 20:57:33 +0700 Subject: [PATCH] Wed May 17 2023 20:57:33 GMT+0700 (Indochina Time) --- 17/34.txt | 6 +----- 17/37.txt | 6 +----- manifest.json | 4 +++- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/17/34.txt b/17/34.txt index 06297a7..4b6f62b 100644 --- a/17/34.txt +++ b/17/34.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 34 Aku bakata ka kao,pada maam koa pasti ada dua urakng daapm sote'k tampat tidur.seko'k urakng pasti di icakng,ba nang laine pasti ditingaatn. \v 35 "Pasti ada dua nang bini ngiling basama-sama. seko'k urakng pasti di icakng, ba nang laine ditingaatn. \v 36 pasti ada dua ka uma,' seko'k diicakng nang laine ditingaatn. -======= -\v 34 Aku bakata ka kao,pada maam koa pasti ada dua urakng daapm sote'k tampat tidur.seko'k urakng pasti di icakng,ba nang laine pasti ditingaatn. \v 35 "Pasti ada dua nang bini ngiling basama-sama. seko'k urakng pasti di icakng, ba nang laine ditingaatn. \v 36 pasti ada dua ka uma,' seko'k diicakng nang laine ditingaatn. " ->>>>>>> b137f52f97f1117ce7ba33d64ebea40c0c32d6c3 +\v 34 Aku bakata ka kao,pada maam koa pasti ada dua urakng daapm sote'k tampat tidur.seko'k urakng pasti di icakng,ba nang laine pasti ditingaatn. \v 35 "Pasti ada dua nang bini ngiling basama-sama. seko'k urakng pasti di icakng, ba nang laine ditingaatn. \v 36 pasti ada dua ka uma,' seko'k diicakng nang laine ditingaatn. " \ No newline at end of file diff --git a/17/37.txt b/17/37.txt index 588750c..d7eb40d 100644 --- a/17/37.txt +++ b/17/37.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 37 Mereka batanya'k an ia,"Di mae Jubata Tuhan?"lalu ia ngataatn kamereka,"Di mae ada bangke,dikoalah burukng pamakatn bangke bakomo'k basama." -======= -\v 37 Aku ina' akan bakata manyak agi' ka kao, sabab panguasa dunia nyian atakng. Ia ina' punya kuasa atasKu. Tapi biar dunia nahui' kade Aku ngasihi Apa', Aku majaanan iya sama aya nang diparentahatn Apa' ka Aku. Ije' diri' bangkit lalu ampus dari dian. ->>>>>>> b137f52f97f1117ce7ba33d64ebea40c0c32d6c3 +\v 37 Aku ina' akan bakata manyak agi' ka kao, sabab panguasa dunia nyian atakng. Ia ina' punya kuasa atasKu. Tapi biar dunia nahui' kade Aku ngasihi Apa', Aku majaanan iya sama aya nang diparentahatn Apa' ka Aku. Ije' diri' bangkit lalu ampus dari dian. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 7ed77f4..51eaaa0 100644 --- a/manifest.json +++ b/manifest.json @@ -27,7 +27,7 @@ "language_id": "id", "resource_id": "ayt", "checking_level": "3", - "date_modified": "2022-03-24T16:02:54.7654831+00:00", + "date_modified": "2023-04-04T17:07:35.0729602+00:00", "version": "1.3" } ], @@ -395,6 +395,8 @@ "17-28", "17-30", "17-32", + "17-34", + "17-37", "18-title", "18-01", "18-03",