summaryrefslogtreecommitdiff
path: root/sql-files/upgrades/2013-04-16--01-24.sql
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-09-16 08:12:48 -0300
committershennetsind <ind@henn.et>2013-09-16 08:12:48 -0300
commit5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7 (patch)
treeda13821a29480d88dcd872c682b26b75e5191482 /sql-files/upgrades/2013-04-16--01-24.sql
parent4eb223b62e70a293dd2c95f1ce8b29a3f0c83ef7 (diff)
parentfe2f840e5d6cb4230ba02c47132790d067b3814d (diff)
downloadhercules-5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7.tar.gz
hercules-5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7.tar.bz2
hercules-5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7.tar.xz
hercules-5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Solved minor conflicts that were caused by the unit interface Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'sql-files/upgrades/2013-04-16--01-24.sql')
-rw-r--r--sql-files/upgrades/2013-04-16--01-24.sql2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-files/upgrades/2013-04-16--01-24.sql b/sql-files/upgrades/2013-04-16--01-24.sql
index 69672b368..a55eebe1a 100644
--- a/sql-files/upgrades/2013-04-16--01-24.sql
+++ b/sql-files/upgrades/2013-04-16--01-24.sql
@@ -1,3 +1,3 @@
#1366075474
#Info http://hercules.ws/board/topic/410-skill-script-command-updatefix/
-UPDATE `skill` SET `flag` = 0 WHERE `flag` = 4 AND `id` != 2535 AND `id` != 681; \ No newline at end of file
+UPDATE `skill` SET `flag` = 0 WHERE `flag` = 4 AND `id` != 2535 AND `id` != 681;