From 63f253e95ca801966077282f27767cf1d191bfec Mon Sep 17 00:00:00 2001
From: MitchesD <majklprofik@seznam.cz>
Date: Sat, 17 Oct 2015 18:38:31 +0200
Subject: Merge pull request #15697 from ShinDarth/cd

Core/Player rewritten duel CD reset system
(cherry picked from commit 4204805d47078abf54e8a1c50321e63193a7c68d)

Conflicts:
	src/server/game/Spells/SpellHistory.cpp
	src/server/game/Spells/SpellHistory.h
	src/server/game/World/World.h
---
 sql/updates/world/2015_10_17_01_world.sql | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 sql/updates/world/2015_10_17_01_world.sql

(limited to 'sql')

diff --git a/sql/updates/world/2015_10_17_01_world.sql b/sql/updates/world/2015_10_17_01_world.sql
new file mode 100644
index 00000000000..f6ddc034e20
--- /dev/null
+++ b/sql/updates/world/2015_10_17_01_world.sql
@@ -0,0 +1 @@
+DELETE FROM `trinity_string` WHERE `entry` = 11010;
-- 
cgit v1.2.3