fix merge master conflict

This commit is contained in:
Atidot3
2024-08-12 09:35:31 +02:00
23 changed files with 1626 additions and 1200 deletions

View File

@@ -285,11 +285,11 @@ enum PRIEST_TABS
PRIEST_TAB_SHADOW,
};
enum DEATHKNIGT_TABS
enum DEATHKNIGHT_TABS
{
DEATHKNIGT_TAB_BLOOD,
DEATHKNIGT_TAB_FROST,
DEATHKNIGT_TAB_UNHOLY,
DEATHKNIGHT_TAB_BLOOD,
DEATHKNIGHT_TAB_FROST,
DEATHKNIGHT_TAB_UNHOLY,
};
enum DRUID_TABS