Resolve a merge error
This commit is contained in:
parent
142505f398
commit
8ac2975816
@ -690,7 +690,6 @@ enum e_mapflag : int16 {
|
|||||||
MF_NOBONUSITEMDROP,
|
MF_NOBONUSITEMDROP,
|
||||||
MF_HIDEDAMAGE,
|
MF_HIDEDAMAGE,
|
||||||
MF_FLEE_PENALTY,
|
MF_FLEE_PENALTY,
|
||||||
MF_MAX,
|
|
||||||
MF_RESTRICTED,
|
MF_RESTRICTED,
|
||||||
MF_TOWN,
|
MF_TOWN,
|
||||||
MF_SPECIALPOPUP,
|
MF_SPECIALPOPUP,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user