mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-21 17:54:48 +01:00
Conflicts: src/server/game/Battlegrounds/ArenaTeam.h src/server/game/Battlegrounds/BattlegroundMgr.cpp src/server/game/Battlegrounds/BattlegroundMgr.h src/server/game/Globals/ObjectMgr.cpp src/server/game/Globals/ObjectMgr.h