aboutsummaryrefslogtreecommitdiff
path: root/sql/updates/389_world.sql
diff options
context:
space:
mode:
authorw12x <none@none>2008-12-22 23:13:13 +0100
committerw12x <none@none>2008-12-22 23:13:13 +0100
commitea891c0575e4a76f26d3fb8ec9c7a2f4eff4a9bf (patch)
treebe894d0df625f1740aac9d683efe62febaa77d73 /sql/updates/389_world.sql
parentdcfb635d5b924d13960c33a83f0f059b6f7116c1 (diff)
parent8c0ba464c6fa97fda0bfd5b3f135f299a1531c8e (diff)
merging heads, I wonder why hg cannot merge more than 2 at once
--HG-- branch : trunk
Diffstat (limited to 'sql/updates/389_world.sql')
-rw-r--r--sql/updates/389_world.sql2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/updates/389_world.sql b/sql/updates/389_world.sql
index 5dc88d362ae..bbe7fb6fcc6 100644
--- a/sql/updates/389_world.sql
+++ b/sql/updates/389_world.sql
@@ -4,4 +4,4 @@ INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `commen
INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (-24133, 24135, 0, 'Wyvern Sting');
INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (-27068, 27069, 0, 'Wyvern Sting');
INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (-49011, 49009, 0, 'Wyvern Sting');
-INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (-49012, 49010, 0, 'Wyvern Sting'); \ No newline at end of file
+INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (-49012, 49010, 0, 'Wyvern Sting');