Merge conflicts abound and now are fixed

This commit is contained in:
KimLS committed 2015-07-02 20:12:51 -07:00
commit 214873c139
67 files changed
+24488 -5020

No files matched your search

+1 -1
View File
@@ -339,7 +339,7 @@
9083|2015_06_07_aa_update.sql|SHOW COLUMNS FROM `character_alternate_abilities` LIKE 'charges'|empty|
9084|2015_06_30_runspeed_adjustments.sql|SELECT `runspeed` FROM `npc_types` WHERE `runspeed` > 3|not_empty|
9085|2015_7_1_Marquee_Rule.sql|SELECT * FROM `rule_values` WHERE `rule_name` LIKE '%Character:MarqueeHPUpdates%'|empty|
9086|2015_07_02_aa_rework.sql|SHOW TABLES LIKE 'aa_ranks'|empty|
# Upgrade conditions:
# This won't be needed after this system is implemented, but it is used database that are not
File diff suppressed because it is too large. Load diff