From 8fab27a95f0a197335669ee835075d9d5c5fca38 Mon Sep 17 00:00:00 2001
From: Kevin Midboe <kevin.midboe@gmail.com>
Date: Thu, 20 Sep 2018 23:28:47 +0200
Subject: [PATCH] And the other conflict

---
 src/core.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/core.py b/src/core.py
index 011a56f..9cf7c11 100755
--- a/src/core.py
+++ b/src/core.py
@@ -285,11 +285,6 @@ def pickforgirlscouts(video):
 
     elif isinstance(video, Episode):
         if video.series != None and video.season != None and video.episode != None and type(video.episode) != list:
-<<<<<<< HEAD
-            home_path = '{} S{}E{}'.format(str(video.series), str(video.season), str(video.episode))
-            movingToCollege(video, home_path)
-            return True
-=======
             # Handle the list problems
             home_path = '{} S{:02d}E{:02d}'.format(str(video.series), str(video.season), str(video.episode))
             try: 
@@ -297,7 +292,6 @@ def pickforgirlscouts(video):
                 return True
             except:
                 return False
->>>>>>> 916ce45fecb6d2b9edbed0a408ea1a16b7d85d0b
 
     return False