I have problems implementing the Transmogrification Display Vendor. I am using the latest TC core from (yesterday). This is what I get when I enter git pull rochet2 transmogvendor to a clean core:
Could you please help me fix this? Thanks in advance!
git pull rochet2 transmogvendor
remote: Counting objects: 640, done.
remote: Compressing objects: 100% (48/48), done.
remote: Total 640 (delta 201), reused 188 (delta 188), pack-reused 404
Receiving objects: 100% (640/640), 437.68 KiB, done.
Resolving deltas: 100% (421/421), completed with 73 local objects.
* branch transmogvendor -> FETCH_HEAD
CONFLICT (content): Merge conflict in src/server/game/Entities/Player/Player.cpp
Automatic merge failed; fix conflicts and then commit the result.