From ef0d15bef9c35f261c4d09bbb23a2b8731acd3fc Mon Sep 17 00:00:00 2001
From: ClarkeCode <clarke.john.robert@gmail.com>
Date: Fri, 28 Apr 2023 19:44:43 -0400
Subject: Resolving merge conflicts

---
 extension/src/openvic2/map/Map.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'extension/src/openvic2/map/Map.hpp')

diff --git a/extension/src/openvic2/map/Map.hpp b/extension/src/openvic2/map/Map.hpp
index a664d96..e5be9c7 100644
--- a/extension/src/openvic2/map/Map.hpp
+++ b/extension/src/openvic2/map/Map.hpp
@@ -28,7 +28,7 @@ namespace OpenVic2 {
 	struct Map {
 		#pragma pack(push, 1)
 		struct shape_pixel_t {
-			Province::index_t index;
+			index_t index;
 			uint8_t terrain;
 		};
 		#pragma pack(pop)
-- 
cgit v1.2.3-56-ga3b1