diff options
| author | garak <garakmon@gmail.com> | 2018-12-03 16:58:28 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-12-03 16:58:28 -0500 |
| commit | 2c14d6ee6c40f4b7e5cd9366080ce911d67be718 (patch) | |
| tree | 4a70ca275a2f161d2d23f63d0608f92d8ea08acb /src/data/field_event_obj/event_object_graphics_info_pointers.h | |
| parent | d6a88e0eaa7d74f187fb27f8a376203f40537340 (diff) | |
| parent | d9a5de5317d4589b139f9532a7e8bf3b851e673f (diff) | |
fix merge conflicts
Diffstat (limited to 'src/data/field_event_obj/event_object_graphics_info_pointers.h')
| -rwxr-xr-x | src/data/field_event_obj/event_object_graphics_info_pointers.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/data/field_event_obj/event_object_graphics_info_pointers.h b/src/data/field_event_obj/event_object_graphics_info_pointers.h index 3f726e30e..f57e294c3 100755 --- a/src/data/field_event_obj/event_object_graphics_info_pointers.h +++ b/src/data/field_event_obj/event_object_graphics_info_pointers.h @@ -1,6 +1,3 @@ -#ifndef GUARD_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H -#define GUARD_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H - const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanNormal; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanMachBike; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanSurfing; @@ -500,5 +497,3 @@ const struct EventObjectGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[ &gEventObjectGraphicsInfo_UnusedMauvilleOldMan1, &gEventObjectGraphicsInfo_UnusedMauvilleOldMan2, }; - -#endif //GUARD_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H |