From c0e2b414f69bd8180b015b16bd7ae63b1a1ddc01 Mon Sep 17 00:00:00 2001 From: "bahasatech.indotimur" Date: Fri, 19 May 2023 06:41:40 -0700 Subject: [PATCH] Fri May 19 2023 06:41:39 GMT-0700 (Pacific Daylight Time) --- 04/01.txt | 7 +------ manifest.json | 1 + 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/04/01.txt b/04/01.txt index 4a04afd..a36143e 100644 --- a/04/01.txt +++ b/04/01.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\c 4 (Myaokodon Ani Israel Ke Amon Kisir) \v 1 Israel rigavvo Myaokodon sin maidav kedarimdian Myaokodon ani Esin Enetufbarnake ayao rigafke aganken,Hawa yakon sin,Myaokodon ke nyamkohaser \v 2 Iti sin esevah ke,merhau ke,omsor -ke,haisimahan ke sanau ke Mahomae barnaken -======= -\c 4 (MYAO KODON Ani Israel Ke Amon Kisir) \v 1 Israel rigav vo MYAO KODON sin maidav ke darimdian MYAO KODON ni eni ayau rigav ke mamon nake gu "iti badan romon utum ke monenae,marke eni ayao MYAO KODON ke vinanmota haser kimaken disir. \v 2 Iti sin esevah ke,merhau ke,omsor ke,hisimahan ke sanau ke dimon haisav vinan ke badahomae kahane es imava rohone es imava makomain ke. ->>>>>>> 7f755315b0818cc93771e121c82d11ed364407bb +\c 4 (MYAO KODON Ani Israel Ke Amon Kisir) \v 1 Israel rigav vo MYAO KODON sin maidav ke darimdian MYAO KODON ni eni ayau rigav ke mamon nake gu "iti badan romon utum ke monenae,marke eni ayao MYAO KODON ke vinanmota haser kimaken disir. \v 2 Iti sin esevah ke,merhau ke,omsor ke,hisimahan ke sanau ke dimon haisav vinan ke badahomae kahane es imava rohone es imava makomain ke. \ No newline at end of file diff --git a/manifest.json b/manifest.json index be2c924..e6e82d9 100644 --- a/manifest.json +++ b/manifest.json @@ -55,6 +55,7 @@ "03-01", "03-04", "04-title", + "04-01", "05-title", "08-title", "09-title",