Skip to content

Commit

Permalink
Fix merge issues in spell.sql
Browse files Browse the repository at this point in the history
  • Loading branch information
killerwife committed Aug 22, 2021
1 parent 3d2fccf commit 1d8a686
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions sql/scriptdev2/spell.sql
Expand Up @@ -561,7 +561,7 @@ INSERT INTO spell_scripts(Id, ScriptName) VALUES
(20271,'spell_judgement'),
(57774,'spell_judgement'),
(53408,'spell_judgement'),
(31789,'spell_righteous_defense');
(31789,'spell_righteous_defense'),
(40470,'spell_paladin_tier_6_trinket');

-- Warlock
Expand Down Expand Up @@ -683,7 +683,7 @@ INSERT INTO spell_scripts(Id, ScriptName) VALUES
(9858,'spell_regrowth'),
(26980,'spell_regrowth'),
(48442,'spell_regrowth'),
(48443,'spell_regrowth');
(48443,'spell_regrowth'),
(1178,'spell_druid_form_scaling_ap_auras'),
(3025,'spell_druid_form_scaling_ap_auras'),
(9635,'spell_druid_form_scaling_ap_auras'),
Expand Down

0 comments on commit 1d8a686

Please sign in to comment.