From 71240e56a0245eb68054c86a5a6236a1a2650fd7 Mon Sep 17 00:00:00 2001
From: Twentysix <Twentysix26@users.noreply.github.com>
Date: Sun, 24 Apr 2016 00:49:18 +0200
Subject: [PATCH] Typo

---
 cogs/downloader.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/cogs/downloader.py b/cogs/downloader.py
index 39b74429f..6bd6c5780 100644
--- a/cogs/downloader.py
+++ b/cogs/downloader.py
@@ -287,8 +287,6 @@ def check_files():
         print("Creating default data/downloader/repos.json")
         fileIO(f, "save", repos)
 
->>>>>>> f3b02f3539b7c2b9eac1ce4548b01700871c9fcd
-
 def setup(bot):
     check_folders()
     check_files()