Resolve conflict

This commit is contained in:
SammygoodTunes
2025-04-01 21:25:04 +02:00
parent 6b9df2f470
commit 7608f9c808
+2 -2
View File
@@ -112,8 +112,8 @@ public:
/* 188 */ unk8 mUnk_188[0x14];
/* 19c */ unk32 mUnk_19c;
/* 1a0 */ Vec3p mUnk_1a0;
/* 1ac */ s16 mUnk_1ac;
/* 1ae */ unk8 mUnk_1ae[2];
/* 1a0 */ unk8 mUnk_1a0[0xc];
/* 1ac */ unk32 mUnk_1ac;
/* 1b0 */
/* 00 */ virtual ~MapBase();