Thu Sep 13 2018 22:04:30 GMT+0800 (Malay Peninsula Standard Time)

2018-09-13 22:04:31 +08:00 · 2018-09-13 22:04:31 +08:00 · 002f33c80e
parent 00d6b8f74d
commit 002f33c80e
2 changed files with 3 additions and 6 deletions
--- a/01/title.txt
+++ b/01/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-pasal 4
-=======
 Pasal 1
->>>>>>> c6396574e944e7c45868d245a6f1499a22bfcf83
--- a/manifest.json
+++ b/manifest.json
@ -39,7 +39,8 @@
 		"helianus diil",
 		"dayak sisang",
 		"jireh elion christian lima",
-		"EVAN RIANTO"
+		"EVAN RIANTO",
+		"Dayak Sisang"
 	],
 	"finished_chunks": [
 		"01-01",