From 9342496a1222bbb5dff7de18d6ab23e5d2a28af4 Mon Sep 17 00:00:00 2001
From: Fuffenz <fuffenz@fuffenz.com>
Date: Wed, 11 Nov 2015 21:05:40 +0100
Subject: [PATCH] gft

---
 src/Jackett/Jackett.csproj | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Jackett/Jackett.csproj b/src/Jackett/Jackett.csproj
index d0d3813bc..102298a29 100644
--- a/src/Jackett/Jackett.csproj
+++ b/src/Jackett/Jackett.csproj
@@ -199,11 +199,8 @@
     <Compile Include="Indexers\Demonoid.cs" />
     <Compile Include="Indexers\FrenchTorrentDb.cs" />
     <Compile Include="Indexers\BroadcastTheNet.cs" />
-<<<<<<< HEAD
     <Compile Include="Indexers\DanishBits.cs" />
-=======
     <Compile Include="Indexers\GFTracker.cs" />
->>>>>>> refs/remotes/origin/GFTracker
     <Compile Include="Indexers\TehConnection.cs" />
     <Compile Include="Indexers\Hounddawgs.cs" />
     <Compile Include="Indexers\Shazbat.cs" />