From f51fbea630e4eb4b5010b356469825ee99e76a08 Mon Sep 17 00:00:00 2001
From: tsDesktop <you@example.com>
Date: Wed, 26 Jul 2017 20:02:03 +0100
Subject: [PATCH] Wed Jul 26 2017 20:02:01 GMT+0100 (Paris, Madrid)

---
 03/09.txt     | 6 +-----
 manifest.json | 3 ++-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/03/09.txt b/03/09.txt
index 715d19b..6deea03 100644
--- a/03/09.txt
+++ b/03/09.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 10 \v 11 \v 9 Tonani tembe ya booka ekiya otangi makokombo mayike ma mikotiya, phé na miwanyo na tembe ya eyeni mibeko. tona binda bango yomu edi inda ya masi edjangi tina.
-=======
-\v 10 Soki moto ameki ekambi indeko beke miteya mbala moto , na ya mbala ibale soki bobo e wokini awe tika ango. \v 11 yebabo moto wa ndengue yemu agnangani o nguiya a tumi na bikuna adi ewasoli itumbu.
->>>>>>> e2f8d3df89a69117418b574b6c760376b0bb0a05
+\v 9 \v 10 Soki moto ameki ekambi indeko beke miteya mbala moto , na ya mbala ibale soki bobo e wokini awe tika ango. \v 11 yebabo moto wa ndengue yemu agnangani o nguiya a tumi na bikuna adi ewasoli itumbu.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 6fabd39..82ddb73 100644
--- a/manifest.json
+++ b/manifest.json
@@ -34,7 +34,8 @@
 	"parent_draft": {},
 	"translators": [
 		"Yves-booto",
-		"Mikagnya"
+		"Mikagnya",
+		"yves booto"
 	],
 	"finished_chunks": [
 		"front-title",