From 8554622cf27d17e1f7717fe4b440d8a8d1ec5946 Mon Sep 17 00:00:00 2001
From: jdwood <jdwood@noreply.door43.org>
Date: Fri, 4 Aug 2017 12:35:28 -0400
Subject: [PATCH] Fri Aug 04 2017 12:35:28 GMT-0400 (EDT)

---
 07/01.txt     | 6 +-----
 07/04.txt     | 6 +-----
 manifest.json | 2 ++
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/07/01.txt b/07/01.txt
index 4e6650d..ee94e4c 100644
--- a/07/01.txt
+++ b/07/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 7 \v 1 E ne e le Melekiseteka , kgosi ya Salema , moperesiti wa Modimo Mogodimodimo, yo o neng a segofatsa Aborahama fa a kopana nae a tswa go bolaya dikgosi abo a mosegofatsa. \v 2 Aborahama o ne a mo fa bolesome jwa sengwe le sengwe . Leina le la gagwe ''Melekiseteka'' le raya ''kgosi ya tshiamo''. Maemo a mangwe a gagwe ke '' kgosi ya Salema'' , ke gore '' kgosi ya kagiso''. \v 3 Ga a na rraagwe , mmaagwe , asena borragwe mogolo, le fa e le matsalo le yone phelelo ya botshelo . Boemong jwa moo, o tshwana le Morwa Modimo, gonne o ntse moperesiti ka bosakhutleng .
-=======
-\c 7 \v 1 E ne e le Melekiseteke , kgosi ya Salema , moperesiti wa Modimo Mogodimodimo, yo o neng a segofatsa Aborehama fa a kopana nae a tswa go bolaya dikgosi abo a mosegofatsa. \v 2 Aborehama o ne a mo fa bolesome jwa sengwe le sengwe . Leina le la gagwe ''Melekiseteke'' le raya ''kgosi ya tshiamo''. Maemo a mangwe a gagwe ke '' kgosi ya Salema'' , ke gore '' kgosi ya kagiso''. \v 3 Ga a na rraagwe , mmaagwe , ga a na borragwe mogolo, le fa e le matsalo le yone phelelo ya botshelo . Boemong jwa moo, o tshwana le Morwa Modimo, gonne o ntse moperesiti ka bosakhutleng.
->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
+\c 7 \v 1 E ne e le Melekiseteke , kgosi ya Salema , moperesiti wa Modimo Mogodimodimo, yo o neng a segofatsa Aborehama fa a kopana nae a tswa go bolaya dikgosi abo a mosegofatsa. \v 2 Aborehama o ne a mo fa bolesome jwa sengwe le sengwe . Leina le la gagwe ''Melekiseteke'' le raya ''kgosi ya tshiamo''. Maemo a mangwe a gagwe ke '' kgosi ya Salema'' , ke gore '' kgosi ya kagiso''. \v 3 Ga a na rraagwe , mmaagwe , ga a na borragwe mogolo, le fa e le matsalo le yone phelelo ya botshelo . Boemong jwa moo, o tshwana le Morwa Modimo, gonne o ntse moperesiti ka bosakhutleng.
\ No newline at end of file
diff --git a/07/04.txt b/07/04.txt
index 562a8f7..328ed57 100644
--- a/07/04.txt
+++ b/07/04.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 4 Bona ka fa monna yo a leng mogolo ka teng . Rraarona Aborahama o mo file bolesome jwa dilo tse a di tsereng kwa ntweng . \v 5 Ka fa ntlheng e nngwe , barwa Lifi ba amogela boperesiti ba na le taelo go tswa molaong go tsaya bolesome go tswa mo bathong , ke gore , go tswa mo go barwarraabone ntswa le bone ba tsetswe ke Aborahama . \v 6 Ka fa ntlheng e nngwe , Melekiseteka , yo matsalo a gagwe a neng a sa amane le bone , o ne a amogela bolesome mo go Aborahama , a bo a mo segofatsa , ebong ene yo o nang le ditsholofetso .
-=======
-\v 4 Bona ka fa monna yo a ne a le mogolo ka teng . Rraarona Aborehama o mo file bolesome jwa dilo tse a di tsereng kwa ntweng . \v 5 Ka fa ntlheng e nngwe , barwa Lifi ba amogela boperesiti ba na le taelo go tswa molaong go tsaya bolesome go tswa mo bathong , ke gore , go tswa mo go barwarraabone ntswa le bone ba tsetswe ke Aborehama . \v 6 Ka fa ntlheng e nngwe , Melekiseteke , yo matsalo a gagwe a neng a sa amane le bone , o ne a amogela bolesome mo go Aborehama , a bo a mo segofatsa , ebong ene yo o nang le ditsholofetso .
->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
+\v 4 Bona ka fa monna yo a ne a le mogolo ka teng . Rraarona Aborehama o mo file bolesome jwa dilo tse a di tsereng kwa ntweng . \v 5 Ka fa ntlheng e nngwe , barwa Lifi ba amogela boperesiti ba na le taelo go tswa molaong go tsaya bolesome go tswa mo bathong , ke gore , go tswa mo go barwarraabone ntswa le bone ba tsetswe ke Aborehama . \v 6 Ka fa ntlheng e nngwe , Melekiseteke , yo matsalo a gagwe a neng a sa amane le bone , o ne a amogela bolesome mo go Aborehama , a bo a mo segofatsa , ebong ene yo o nang le ditsholofetso .
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index d2c0ee9..d2b0c3c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -103,6 +103,8 @@
 		"06-16",
 		"06-19",
 		"07-title",
+		"07-01",
+		"07-04",
 		"08-title",
 		"08-13",
 		"09-title",