1ddaf75bbd
# Conflicts: # .github/workflows/core-build-nopch.yml # .github/workflows/core-build-pch.yml # .github/workflows/macos_build.yml # .github/workflows/windows_build.yml # src/server/game/DataStores/DBCStores.cpp # src/server/game/Guilds/Guild.h # src/server/game/Scripting/ScriptDefines/DatabaseScript.cpp # src/server/game/Server/WorldSession.h