Wed Oct 04 2017 11:43:54 GMT+0300 (E. Africa Standard Time)

2017-10-04 11:43:55 +03:00 · 2017-10-04 11:43:55 +03:00 · b9c3a179cb
parent 37de9a4da3
commit b9c3a179cb
2 changed files with 4 additions and 6 deletions
--- a/01/05.txt
+++ b/01/05.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-ምዕራፍ 2
-=======
-\v 5 \v 6 \v 7 ምዕራፍ 2
->>>>>>> b8174798a0ace49d669663f3abd34a541ff2fe91
+\v 5 \v 6 \v 7 ምዕራፍ 2
--- a/manifest.json
+++ b/manifest.json
@ -32,6 +32,8 @@
 		}
 	],
 	"parent_draft": {},
-	"translators": [],
+	"translators": [
+		"fikerte"
+	],
 	"finished_chunks": []
 }