From aeb949aa23ad4cc79d6174b326fb5c8b58a6cc9d Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Fri, 5 Aug 2011 15:39:04 -0400
Subject: [PATCH] Fix merge

---
 src/libtomahawk/CMakeLists.txt | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
index 1b5a435bb..4dfe323c0 100644
--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
@@ -443,13 +443,8 @@ IF( APPLE )
       utils/tomahawkutils_mac.mm )
 
     SET( libHeaders ${libHeaders}
-<<<<<<< HEAD
       infosystem/infoplugins/mac/adium.h
       infosystem/infoplugins/mac/adiumplugin.h )
-=======
-      infosystem/infoplugins/mac/adiumplugin.h
-      widgets/maclineedit.h )
->>>>>>> master
 
     SET( OS_SPECIFIC_LINK_LIBRARIES
         ${OS_SPECIFIC_LINK_LIBRARIES}