From 18efde3b02e2aaba51f01535daaa2cc078fa420f Mon Sep 17 00:00:00 2001 From: nordsoft Date: Tue, 2 May 2023 01:58:19 +0400 Subject: [PATCH] Fix incorrect merge --- lib/GameConstants.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/lib/GameConstants.h b/lib/GameConstants.h index cb1c6eb30..6042f1332 100644 --- a/lib/GameConstants.h +++ b/lib/GameConstants.h @@ -596,16 +596,6 @@ namespace EMarketMode }; } -namespace EMarketMode -{ - enum EMarketMode - { - RESOURCE_RESOURCE, RESOURCE_PLAYER, CREATURE_RESOURCE, RESOURCE_ARTIFACT, - ARTIFACT_RESOURCE, ARTIFACT_EXP, CREATURE_EXP, CREATURE_UNDEAD, RESOURCE_SKILL, - MARTKET_AFTER_LAST_PLACEHOLDER - }; -} - namespace MappedKeys {