Resolve a merge error

This commit is contained in:
aleos 2024-08-01 12:24:28 -04:00
parent 142505f398
commit 8ac2975816

View File

@ -690,7 +690,6 @@ enum e_mapflag : int16 {
MF_NOBONUSITEMDROP,
MF_HIDEDAMAGE,
MF_FLEE_PENALTY,
MF_MAX,
MF_RESTRICTED,
MF_TOWN,
MF_SPECIALPOPUP,