Merge remote-tracking branch 'origin/master' into mmaps

2 files changed, 2 insertions, 2 deletions

diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
index c97fd40929a..14ea31a6518 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
@@ -59,7 +59,7 @@ enum Emotes
     EMOTE_SLOW                  = 0,
     EMOTE_FREEZE                = 1,
     EMOTE_FROZEN                = 2,
-    
+
     EMOTE_CRACK                 = 3,
     EMOTE_SHATTER               = 4,
     EMOTE_EXPLODE               = 5
diff --git a/src/server/scripts/Kalimdor/moonglade.cpp b/src/server/scripts/Kalimdor/moonglade.cpp
index f438275b82a..14a76cc153e 100644
--- a/src/server/scripts/Kalimdor/moonglade.cpp
+++ b/src/server/scripts/Kalimdor/moonglade.cpp
@@ -323,7 +323,7 @@ public:
         }
 
         void IsSummonedBy(Unit* /*summoner*/)
-        {            
+        {
             std::list<Player*> playerOnQuestList;
             Trinity::AnyPlayerInObjectRangeCheck checker(me, 5.0f);
             Trinity::PlayerListSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(me, playerOnQuestList, checker);