fix: fix up conflicts

This commit is contained in:
Seth Barberee 2024-10-04 08:45:55 -07:00
parent 15362a9772
commit b6e90631fe

View File

@ -1,6 +1,8 @@
#ifndef GUARD_CODE_8069D4C_H
#define GUARD_CODE_8069D4C_H
#include "structs/dungeon_entity.h"
// NOTE: basically Offense struct but packed to match
struct unkStruct_8069D4C_sub
{