From a36693bd4c2186db7e9907f192b70095bcd59935 Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Sat, 19 May 2012 17:40:53 -0400
Subject: [PATCH] Fix merge

---
 src/libtomahawk/AclRegistry.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/libtomahawk/AclRegistry.cpp b/src/libtomahawk/AclRegistry.cpp
index be8a5bbd3..f1554ede2 100644
--- a/src/libtomahawk/AclRegistry.cpp
+++ b/src/libtomahawk/AclRegistry.cpp
@@ -200,10 +200,7 @@ ACLRegistry::queueNextJob()
     if ( m_jobCount != 0 )
         return;
 
-<<<<<<< HEAD
     tDebug() << Q_FUNC_INFO << "jobQueue size = " << m_jobQueue.length();
-=======
->>>>>>> master
     if ( !m_jobQueue.isEmpty() )
     {
         AclJobItem* job = m_jobQueue.dequeue();