Closed Marlamin closed 4 years ago
Not exactly a merger issue, but a Windows issue. Merger works fine as is on case sensitive file systems.
Affected files that merge fine on my Ubuntu box but aren't present in master because that is updated on a Windows system (mine):
definitions/BannedAddons.dbd
definitions/Keychain.dbd
definitions/LFGDungeonExpansion.dbd
definitions/LFGDungeonGroup.dbd
definitions/LFGDungeons.dbd
definitions/LFGRoleRequirement.dbd
definitions/PVPDifficulty.dbd
definitions/PVPItem.dbd
Yay.
fixed as per 3f6e6e080919e236464b5ffd75234b325a602a53
Such as LfgDungeons which is now LFGDungeons.