Minor correction to merge

src/server/game/DataStores/DBCfmt.h

@@ -68,7 +68,7 @@ char const GtChanceToMeleeCritBasefmt[] = "xf";
 char const GtChanceToMeleeCritfmt[] = "xf";
 char const GtChanceToSpellCritBasefmt[] = "xf";
 char const GtChanceToSpellCritfmt[] = "xf";
-char const GtNPCManaCostScalerfmt[] = "f";
+char const GtNPCManaCostScalerfmt[] = "xf";
 char const GtOCTClassCombatRatingScalarfmt[] = "df";
 char const GtOCTRegenHPfmt[] = "f";
 //char const GtOCTRegenMPfmt[] = "f";

src/server/game/Handlers/CharacterHandler.cpp

@@ -1093,7 +1093,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
 
         if (pCurrChar->getClass() == CLASS_HUNTER)
         {
-            static uint32 const HunterCreatePetSpells[MAX_RACES] = 
+            static uint32 const HunterCreatePetSpells[MAX_RACES] =
             {
                    0,  /* None */                          79597,  /* Human - Young Wolf */
                79598,  /* Orc - Young Boar */              79593,  /* Dwarf - Young Bear */