{"shas":[["4be4cc394d9529156960f374864be74a2256df4f","f4c914b2f30ab2a1e0285871eef549589f045220@web.de","Merge remote branch 'TrinityCore/master'\n\nConflicts:\n\tsrc/server/game/Entities/Vehicle/Vehicle.cpp\n\tsrc/server/scripts/Northrend/CMakeLists.txt\n\tsrc/server/scripts/Northrend/Naxxramas/boss_gothik.cpp\n\tsrc/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp\n\tsrc/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp\n\tsrc/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp\n\tsrc/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp\n\tsrc/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp\n\tsrc/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp\n\tsrc/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp\n\tsrc/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp\n\tsrc/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp\n\tsrc/server/scripts/Northrend/Ulduar/ulduar/ulduar.h","BroodWyrm"],["e36b483c6732af8497b202e8d5fd2ba12e2610de","f4c914b2f30ab2a1e0285871eef549589f045220@web.de","* Fix Compile Errors","BroodWyrm"]],"ref":"refs/heads/master","size":2,"head":"e36b483c6732af8497b202e8d5fd2ba12e2610de","push_id":33095254}