Missing some merge errors

mangostwo · Oct 22, 2023 · b7f0741 · b7f0741
1 parent 2212e1e
commit b7f0741
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/src/game/Object/Player.cpp b/src/game/Object/Player.cpp
@@ -4014,12 +4014,7 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank, bo
     if (sSpellMgr.IsPrimaryProfessionFirstRankSpell(spell_id))
     {
         uint32 freeProfs = GetFreePrimaryProfessionPoints() + 1;
-<<<<<<< HEAD
-        uint32 maxProfs = GetSession()->GetSecurity() < AccountTypes(sWorld.getConfig(CONFIG_UINT32_TRADE_SKILL_GMIGNORE_MAX_PRIMARY_COUNT)) ? sWorld.getConfig(CONFIG_UINT32_MAX_PRIMARY_TRADE_SKILL) : 11;
-        if (freeProfs <= maxProfs)
-=======
         if (freeProfs <= sWorld.getConfig(CONFIG_UINT32_MAX_PRIMARY_TRADE_SKILL))
->>>>>>> 360ddbdf8 (Fix Trade Skill Limit (#192))
         {
             SetFreePrimaryProfessions(freeProfs);
         }
@@ -23457,13 +23452,7 @@ void Player::SetPhaseMask(uint32 newPhaseMask, bool update)
 
 void Player::InitPrimaryProfessions()
 {
-<<<<<<< HEAD
-    uint32 maxProfs = GetSession()->GetSecurity() < AccountTypes(sWorld.getConfig(CONFIG_UINT32_TRADE_SKILL_GMIGNORE_MAX_PRIMARY_COUNT))
-                      ? sWorld.getConfig(CONFIG_UINT32_MAX_PRIMARY_TRADE_SKILL) : 11;
-    SetFreePrimaryProfessions(maxProfs);
-=======
     SetFreePrimaryProfessions(sWorld.getConfig(CONFIG_UINT32_MAX_PRIMARY_TRADE_SKILL));
->>>>>>> 360ddbdf8 (Fix Trade Skill Limit (#192))
 }
 
 void Player::SendComboPoints()