From 701f709c23dc7ab356c65579b9d814d01d88d2cc Mon Sep 17 00:00:00 2001
From: Ade <ade_hall@yahoo.co.uk>
Date: Thu, 28 Aug 2014 18:12:24 +1200
Subject: [PATCH] Revert "Creating two functions from duplicated code"

This reverts commit 59b4cefd53bab74cc95d708e04616aafb3dc0f97.

Conflicts:
headphones/postprocessor.py

Reverting PP changes
---
 headphones/postprocessor.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/headphones/postprocessor.py b/headphones/postprocessor.py
index b4381934..f6146b7d 100644
--- a/headphones/postprocessor.py
+++ b/headphones/postprocessor.py
@@ -30,6 +30,7 @@ from headphones import logger, helpers, request, mb, music_encoder
 
 postprocessor_lock = threading.Lock()
 
+<<<<<<< HEAD
 
 def find_in_path(albumpath, extra_formats=None, use_MF=True):
     """ Takes a path and optionally extra formats.
@@ -73,6 +74,8 @@ def count_matches(track_list, match, inverted=False):
     return nr_of_matches, new_list
 
 
+=======
+>>>>>>> parent of 59b4cef... Creating two functions from duplicated code
 def checkFolder():
 
     with postprocessor_lock: