diff options
| author | Spp <spp@jorge.gr> | 2013-01-17 08:48:04 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2013-01-17 08:48:04 +0100 |
| commit | 7d6634e3636c6090139c1415d164329ff03bb95f (patch) | |
| tree | 1a769e9fa17e8dcbcb3c82e206d6b4927ba708ca /src | |
| parent | 0e8011657d08c4a9f12657ccbe2f73aa56effaaa (diff) | |
Fix merge problem
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h | 2 |
1 files changed, 0 insertions, 2 deletions
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, |