dressnpcs can not merge with latest tc

Rochet2 / TrinityCore

Rochet2's stuff for TC

https://rochet2.github.io

90 stars 143 forks source link

Closed qyh214 closed 5 years ago

qyh214 commented 5 years ago

Description:

dressnpcs can not merge with latest tc(TrinityCore/TrinityCore@8f91a85aaa789276e0b9a6486ae96b978ec281d9),please update

Current behaviour:

can not merge

Expected behaviour:

can merge

Steps to reproduce the problem:

N/A

Branch(es):

3.3.5

TC rev. hash/commit: 8f91a85aaa789276e0b9a6486ae96b978ec281d9

Operating system: win10 x64

Rochet2 commented 5 years ago