Merge

--HG--
branch : trunk

1 files changed, 3 insertions, 3 deletions

diff --git a/src/game/ChannelMgr.cpp b/src/game/ChannelMgr.cpp
index 16a236a1f95..90c1b62f69a 100644
--- a/src/game/ChannelMgr.cpp
+++ b/src/game/ChannelMgr.cpp
@@ -26,12 +26,12 @@ INSTANTIATE_SINGLETON_1( HordeChannelMgr );
 ChannelMgr* channelMgr(uint32 team)
 {
     if (sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHANNEL))
-        return &MaNGOS::Singleton<AllianceChannelMgr>::Instance();        // cross-faction
+        return &Trinity::Singleton<AllianceChannelMgr>::Instance();        // cross-faction
 
     if(team == ALLIANCE)
-        return &MaNGOS::Singleton<AllianceChannelMgr>::Instance();
+        return &Trinity::Singleton<AllianceChannelMgr>::Instance();
     if(team == HORDE)
-        return &MaNGOS::Singleton<HordeChannelMgr>::Instance();
+        return &Trinity::Singleton<HordeChannelMgr>::Instance();
 
     return NULL;
 }