From 8ac2975816e05d8ec78a5308841a4381e07538bb Mon Sep 17 00:00:00 2001
From: aleos <aleos89@users.noreply.github.com>
Date: Thu, 1 Aug 2024 12:24:28 -0400
Subject: [PATCH] Resolve a merge error

---
 src/map/map.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/map/map.hpp b/src/map/map.hpp
index 244b9d5985..a509ea76d8 100644
--- a/src/map/map.hpp
+++ b/src/map/map.hpp
@@ -690,7 +690,6 @@ enum e_mapflag : int16 {
 	MF_NOBONUSITEMDROP,
 	MF_HIDEDAMAGE,
 	MF_FLEE_PENALTY,
-	MF_MAX,
 	MF_RESTRICTED,
 	MF_TOWN,
 	MF_SPECIALPOPUP,