From 4617e81bbc594719c02f6c1cb658220e3ca33829 Mon Sep 17 00:00:00 2001 From: suhartono Date: Tue, 26 Feb 2019 19:02:17 +0700 Subject: [PATCH] Tue Feb 26 2019 19:02:16 GMT+0700 (SE Asia Standard Time) --- front/title.txt | 6 +----- manifest.json | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/front/title.txt b/front/title.txt index f3dd813..a6a3d10 100644 --- a/front/title.txt +++ b/front/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Filemon -======= -FILEMON ->>>>>>> 58e54ae93713cd5a16e0cf2e723378019ad39aa4 +Filemon \ No newline at end of file diff --git a/manifest.json b/manifest.json index a61be6e..e353c18 100644 --- a/manifest.json +++ b/manifest.json @@ -34,7 +34,8 @@ "parent_draft": {}, "translators": [ "Ibi", - "Suhartono" + "Suhartono", + "dayakibanempran" ], "finished_chunks": [ "01-title",