https://github.com/TrinityCore/TrinityCore/pull/27038#issuecomment-958784361 # Conflicts: # src/server/game/Combat/CombatManager.h
https://github.com/TrinityCore/TrinityCore/pull/27038#issuecomment-958784361 # Conflicts: # src/server/game/Combat/CombatManager.h