Sat May 12 2018 22:18:14 GMT-0700 (Pacific Daylight Time)

2018-05-12 22:18:15 -07:00 · 2018-05-12 22:18:15 -07:00 · 9aab2451fc
parent 39b66cf6be 399fcb1716
commit 9aab2451fc
2 changed files with 7 additions and 3 deletions
--- a/01/title.txt
+++ b/01/title.txt
@ -1 +1,5 @@
+<<<<<<< HEAD
 PASAL 1
+=======
+Pasal 1
+>>>>>>> 399fcb1716edd5796d350ef82ca542c3f8538c72
--- a/manifest.json
+++ b/manifest.json
@ -25,7 +25,8 @@
 		"id": "reg"
 	},
 	"translators": [
-		"Maria elisabet"
+		"Maria elisabet",
+		"dayak laur"
 	],
 	"source_translations": [
 		{
@ -38,7 +39,6 @@
 	],
 	"finished_chunks": [
 		"front-title",
-		"01-title",
 		"01-01",
 		"01-04",
 		"01-08",