From 6b4d5c4a358d46c10c75a586cfbb0b4ee5de19e2 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Tue, 24 Mar 2009 10:52:09 -0600
Subject: *Fix build.

--HG--
branch : trunk
---
 src/game/Player.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src')

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index b688c48fc52..f18e8551354 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -14533,11 +14533,7 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
     //Need to call it to initialize m_team (m_team can be calculated from m_race)
     //Other way is to saves m_team into characters table.
     setFactionForRace(m_race);
-<<<<<<< HEAD:src/game/Player.cpp
     SetMover(this);
-=======
-    SetCharm(NULL);
->>>>>>> ef97c26c0d232525c291f647f3384f9bcfc3ea4b:src/game/Player.cpp
 
     m_class = fields[5].GetUInt8();
 
-- 
cgit v1.2.3