mirror of
https://github.com/vcmi/vcmi.git
synced 2024-11-28 08:48:48 +02:00
Fix incorrect merge
This commit is contained in:
parent
0250e6fb92
commit
18efde3b02
@ -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
|
||||
{
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user