Sat Mar 11 2017 15:57:26 GMT+0200 (South Africa Standard Time)

2017-03-11 15:57:27 +02:00 · 2017-03-11 15:57:27 +02:00 · 192e4cea2e
parent 35f8a254f2
commit 192e4cea2e
2 changed files with 4 additions and 6 deletions
--- a/front/title.txt
+++ b/front/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-Jakoba
-=======
-Jakob
->>>>>>> e83f33f2e2ba0699a2db81ffe640e54b00ab2eb2
+Jakobo
--- a/manifest.json
+++ b/manifest.json
@ -34,9 +34,11 @@
 	"parent_draft": {},
 	"translators": [
 		"NAMETSO AGNES MOGAPI",
-		"Mpho Mahuma"
+		"Mpho Mahuma",
+		"john k streeter"
 	],
 	"finished_chunks": [
+		"front-title",
 		"01-title",
 		"01-01",
 		"01-04",