Fixed merge errors.

[newsbot]

Автор: Fabi


<pre style='white-space:pre-wrap;width:81ex'>Fixed merge errors.</pre>


Подробнее... (https://github.com/cmangos/mangos-cata/commit/e7b730bcd1e31493bef886b7c99e408af4f60e26)