* Merge

--HG--
branch : trunk

2 files changed, 4 insertions, 4 deletions

diff --git a/src/game/TicketMgr.cpp b/src/game/TicketMgr.cpp
index 588ce7f5f2c..b34e371a252 100644
--- a/src/game/TicketMgr.cpp
+++ b/src/game/TicketMgr.cpp
@@ -63,7 +63,7 @@ GM_Ticket* TicketMgr::GetGMTicketByName(const char* name)
 	Player *plr = objmgr.GetPlayer(pname.c_str());
 	if(!plr)
 		return NULL;
-	
+
 	uint64 playerGuid = plr->GetGUID();
 
 	for(GmTicketList::iterator i = GM_TicketList.begin(); i != GM_TicketList.end();)
@@ -184,7 +184,7 @@ void TicketMgr::SaveGMTicket(GM_Ticket* ticket)
     CharacterDatabase.BeginTransaction();
 	CharacterDatabase.Execute(ss.str().c_str());
 	CharacterDatabase.CommitTransaction();
-		
+
 }
 
 void TicketMgr::UpdateGMTicket(GM_Ticket *ticket)
diff --git a/src/game/TicketMgr.h b/src/game/TicketMgr.h
index 9c090f559b0..989acf773e9 100644
--- a/src/game/TicketMgr.h
+++ b/src/game/TicketMgr.h
@@ -59,13 +59,13 @@ class TicketMgr
 		void RemoveGMTicket(uint64 ticketGuid, uint64 GMguid);
 		void UpdateGMTicket(GM_Ticket *ticket);
 		void SaveGMTicket(GM_Ticket* ticket);
-		
+
 		uint64 GenerateTicketID();
 		void InitTicketID();
 		GM_Ticket* GetGMTicket(uint64 ticketGuid);
 		GM_Ticket* GetGMTicketByPlayer(uint64 playerGuid);
 		GM_Ticket* GetGMTicketByName(const char *name);
-		
+
 
 	protected:
 		uint64 m_ticketid;