From 7d6634e3636c6090139c1415d164329ff03bb95f Mon Sep 17 00:00:00 2001 From: Spp Date: Thu, 17 Jan 2013 08:48:04 +0100 Subject: Fix merge problem --- src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'src') diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h index 50d16c44930..90f9c98497c 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h +++ b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h @@ -23,8 +23,6 @@ uint32 const EncounterCount = 5; -#define ZGScriptName "instance_zulgurub" - enum DataTypes { DATA_VENOXIS = 0, -- cgit v1.2.3