BuxBunny
Member
Hello,
I'm running an ElunaTrinityWotlk but whenever I try merging playeritemgossip from rochet2, I get a emrging conflict
PS : I was able to merge multivendor with no problem at all.
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.