• This is a read only backup of the old Emudevs forum. If you want to have anything removed, please message me on Discord: KittyKaev

TrinityCore WotLK ElunaTrinityWotlk and rochet2's playeritemgossip

BuxBunny

Member
Hello,
I'm running an ElunaTrinityWotlk but whenever I try merging playeritemgossip from rochet2, I get a emrging conflict
Code:
Auto-merging src/server/game/Handlers/MiscHandler.cpp
CONFLICT (content): Merge conflict in src/server/game/Handlers/MiscHandler.cpp
Automatic merge failed; fix conflicts and then commit the result.

PS : I was able to merge multivendor with no problem at all.
 
Top