From 728fb93701ac95779ca64ec54d239d9c1c729998 Mon Sep 17 00:00:00 2001
From: Taiba <you@example.com>
Date: Thu, 24 Nov 2016 08:26:07 +0100
Subject: [PATCH] Thu Nov 24 2016 08:26:06 GMT+0100 (W. Central Africa Standard
 Time)

---
 00/title.txt  |  6 +-----
 03/13.txt     |  6 +-----
 03/16.txt     |  6 +-----
 05/21.txt     |  6 +-----
 manifest.json | 31 ++++++++++++++++---------------
 5 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/00/title.txt b/00/title.txt
index 519b95c..a189d1a 100644
--- a/00/title.txt
+++ b/00/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Matayo
-=======
-MATAYO
->>>>>>> 32adfd802a2768e6728edeb2a303e9f425230fd6
+Matayo
\ No newline at end of file
diff --git a/03/13.txt b/03/13.txt
index 97db92d..1c49aeb 100644
--- a/03/13.txt
+++ b/03/13.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 13 Muri ico gihe Yesu ava i galilaya , aja kuri Yorodani kugira ngo yohana amubatize . \v 14 Ariko ashaka kumwangira arikugamba ngo : Ni njewe ukwiriye kubatizwa nawe , none ni weho urikuza ngo nkubatize ?\v 15  Yesu aramusubiza ngo: byemere ubikore, kubera ko ni ngombwa ko dukiranuka muri byose , aremera aramubatiza .
-=======
-\v 13 Muri ico gihe Yesu aza avuye Igalilaya , aja kuri Yorodani kugira ngo yohana amubatize . \v 14 Ariko ashaka kumwangira arikugamba ngo : Ni njewe ukwiriye kubatizwa nawe , none ni weho urikuza kuri njewe ? \v 15 Yesu aramusubiza: byemere, kubera ko ni ngombwa ko dusohoza ibyo gukiranuka byose , aremera aramubatiza .
->>>>>>> 32adfd802a2768e6728edeb2a303e9f425230fd6
+\v 13 Muri ico gihe Yesu aza avuye Igalilaya , aja kuri Yorodani kugira ngo yohana amubatize . \v 14 Ariko ashaka kumwangira arikugamba ngo : Ni njewe ukwiriye kubatizwa nawe , none ni weho urikuza kuri njewe ? \v 15 Yesu aramusubiza: byemere, kubera ko ni ngombwa ko dusohoza ibyo gukiranuka byose , aremera aramubatiza .
\ No newline at end of file
diff --git a/03/16.txt b/03/16.txt
index d4e98a3..783e366 100644
--- a/03/16.txt
+++ b/03/16.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 16 Yesu amaze kubatizwa , ijuru rirakinguka , umwuka gw'Imana kumumanukiraho kusura n'imana .\v 17 Ijwi rwa mw'ijuru ririkugamba ngo : uyu n'umwana nkundaga kandi ndamwishimiraga .
-=======
-\v 16 Yesu amaze kubatizwa , ava mu mazi, nuko, ijuru rirakinguka , nuko abona umwuka gw'Imana gumanuka kuri we gumeze kimwe ng'Inuma, gumuzaho.\v 17 Reba, ijwi rwumvikanira rivuye mw'ijuru ririkugamba ngo : Uyu n'Umwana wanje nkunda kandi wo nishimira, muri we nimwo nashize mo urukundo rwanje rwose.
->>>>>>> 32adfd802a2768e6728edeb2a303e9f425230fd6
+\v 17 \v 16 Yesu amaze kubatizwa , ava mu mazi, nuko, ijuru rirakinguka , nuko abona umwuka gw'Imana gumanuka kuri we gumeze kimwe ng'Inuma, gumuzaho.\v 17 Reba, ijwi rwumvikanira rivuye mw'ijuru ririkugamba ngo : Uyu n'Umwana wanje nkunda kandi wo nishimira, muri we nimwo nashize mo urukundo rwanje rwose.
\ No newline at end of file
diff --git a/05/21.txt b/05/21.txt
index a91646a..838c50a 100644
--- a/05/21.txt
+++ b/05/21.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 21 mumaze kumvako abantu bakera babwiwe ngo : ntukice , uzice wose azacibwa urubanza . \v 22 ariko nanje ndababwiye ngo: umuntu wese reza nakarirz mugenzi we , azacibwa bo urubanza , uzatuka mwenese ngo wa mupfu we , azahamwa n'urukiko , kandi uzatuka mwene se ngo : wa gucucu we , agomba gutabwa mu  muriro wo muri gihonomo .
-=======
-\v 21 mumaze kumvako abantu bakera babwiwe ngo : ntukice , uzica wese azacibwa urubanza . \v 22 ariko nanje ndababwiye ngo : umuntu wese uzarakarira  mugenzi we , azacirwa urubanza , uzatuka mwenese ngo wa mupfu we , azahamwa n'urukiko , kandi uzatuka mwene se ngo : wa gicucu we , agomba gutabwa mu  muriro wo muri gihonomo .
->>>>>>> 32adfd802a2768e6728edeb2a303e9f425230fd6
+\v 21 mumaze kumvako abantu bakera babwiwe ngo : ntukice , uzica wese azacibwa urubanza . \v 22 ariko nanje ndababwiye ngo : umuntu wese uzarakarira mugenzi we , azacirwa urubanza , uzatuka mwenese ngo wa mupfu we , azahamwa n'urukiko , kandi uzatuka mwene se ngo : wa gicucu we , agomba gutabwa mu muriro wo muri gihonomo .
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 5a6ab84..b88da29 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,30 +1,26 @@
 {
-	"project": {
-		"id": "mat",
-		"name": ""
-	},
-	"type": {
-		"id": "text",
-		"name": "Text"
-	},
+	"package_version": 6,
+	"format": "usfm",
 	"generator": {
 		"name": "ts-desktop",
-		"build": ""
+		"build": "55"
 	},
-	"package_version": 6,
 	"target_language": {
 		"direction": "ltr",
 		"id": "rw",
 		"name": "Ikinyarwanda"
 	},
-	"format": "usfm",
+	"project": {
+		"id": "mat",
+		"name": "Matthew"
+	},
+	"type": {
+		"id": "text",
+		"name": "Text"
+	},
 	"resource": {
 		"id": "reg"
 	},
-	"translators": [
-		"KINYABWISHA",
-		"Faustin"
-	],
 	"source_translations": [
 		{
 			"language_id": "en",
@@ -41,6 +37,11 @@
 			"version": "5"
 		}
 	],
+	"translators": [
+		"KINYABWISHA",
+		"Faustin",
+		"Taiba"
+	],
 	"finished_chunks": [
 		"06-14",
 		"01-01",