# Conflicts: # src/server/game/Combat/ThreatManager.h # src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp # src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
# Conflicts: # src/server/game/Combat/ThreatManager.h # src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp # src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp