From a33e52a7810dcba9c1cd08050e9a628ed6a76f14 Mon Sep 17 00:00:00 2001
From: tsDesktop <you@example.com>
Date: Fri, 16 Jun 2017 12:56:20 +0100
Subject: [PATCH] Fri Jun 16 2017 12:56:19 GMT+0100 (W. Central Africa Standard
 Time)

---
 06/17.txt     | 6 +-----
 06/20.txt     | 6 +-----
 manifest.json | 4 +++-
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/06/17.txt b/06/17.txt
index 70a1558..f1486b6 100644
--- a/06/17.txt
+++ b/06/17.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 17 A ramik ndak birid ki duniya tuku akshi da sukta ada bai, akshi danpa aro idak birid wara go pirtik bai. Amman dampa  arokshi i adak Suku mi abariwa birid ki jirewa gada kimu karak. \v 18 A ramikshi da thlam bilan, da birdi i kun wana bilan, da thlaba ndak bari na gizhi getak. \v 19 Dari kasin akshi ki jirewa.
-=======
-\v 17 A ramik ndak birid ki duniya tuku akshi da sukta ada bai, akshi danpa aro idak birid wara go pirtik bai. Amman dampa  arokshi i adak Suku mi abariwa birid ki jirewa gada kimu karak. \v 18 A ramikshi da thlam bilan, da birdi i kun wana bilan, da thlaba ndak bari na gizhi getak. \v 19 Dari kasin akshi ki jirewa .
->>>>>>> 14efab31e38a162d4d9ecb09270b78f9d847c48e
+\v 17 A ramik ndak birid ki duniya tuku akshi da sukta ada bai, akshi danpa aro idak birid wara go pirtik bai. Amman dampa  arokshi i adak Suku mi abariwa birid ki jirewa gada kimu karak. \v 18 A ramikshi da thlam bilan, da birdi i kun wana bilan, da thlaba ndak bari na gizhi getak. \v 19 Dari kasin akshi ki jirewa.
\ No newline at end of file
diff --git a/06/20.txt b/06/20.txt
index 55c88fb..bc2f267 100644
--- a/06/20.txt
+++ b/06/20.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 20 Timoty, ankalchi na be mi nda barichi. Athlab pədəm dari rama thlabginu na be mi anna gamɗaya mi ndak papiya adoro ma zigaya. \v 21 Ndo jəgab ayayata sau amman har da gwapi nakshi da dəvo jiriwa. Har da thlaba na ci
-=======
-\v 20 Timoti, ankalchi na be mi nda bariciu. Athlab pudum dari rama thibginu na be mi anna gamdaya mi ndak papiya adaro ma zigaya. \v 21 Ndo jigab ayayata sau amman har da gwapi nakshi da duvo jirewa. Her da thlaba na ci.
->>>>>>> 14efab31e38a162d4d9ecb09270b78f9d847c48e
+\v 20 Timoti, ankalchi na be mi nda bariciu. Athlab pudum dari rama thibginu na be mi anna gamdaya mi ndak papiya adaro ma zigaya. \v 21 Ndo jigab ayayata sau amman har da gwapi nakshi da duvo jirewa. Her da thlaba na ci.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 6fb1fd5..63b1c87 100644
--- a/manifest.json
+++ b/manifest.json
@@ -91,6 +91,8 @@
 		"06-09",
 		"06-11",
 		"06-13",
-		"06-15"
+		"06-15",
+		"06-17",
+		"06-20"
 	]
 }
\ No newline at end of file