From 88d896d9bc248bc518fe447e43a95cb36a635446 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 26 Jan 2011 01:50:32 +0200
Subject: Fix old merge error in mana.cbp

---
 mana.cbp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/mana.cbp b/mana.cbp
index f206e4c3d..3164d94c4 100644
--- a/mana.cbp
+++ b/mana.cbp
@@ -125,13 +125,10 @@
 		<Unit filename="src\configlistener.h" />
 		<Unit filename="src\configuration.cpp" />
 		<Unit filename="src\configuration.h" />
-<<<<<<< HEAD
-		<Unit filename="src\dropshortcut.cpp" />
-		<Unit filename="src\dropshortcut.h" />
-=======
 		<Unit filename="src\defaults.cpp" />
 		<Unit filename="src\defaults.h" />
->>>>>>> master
+		<Unit filename="src\dropshortcut.cpp" />
+		<Unit filename="src\dropshortcut.h" />
 		<Unit filename="src\effectmanager.cpp" />
 		<Unit filename="src\effectmanager.h" />
 		<Unit filename="src\emoteshortcut.cpp" />
-- 
cgit v1.2.3-60-g2f50