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/decoration/header.h | |
| parent | d6a88e0eaa7d74f187fb27f8a376203f40537340 (diff) | |
| parent | d9a5de5317d4589b139f9532a7e8bf3b851e673f (diff) | |
fix merge conflicts
Diffstat (limited to 'src/data/decoration/header.h')
| -rw-r--r-- | src/data/decoration/header.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/data/decoration/header.h b/src/data/decoration/header.h index 64bed1c7e..a909bd9fd 100644 --- a/src/data/decoration/header.h +++ b/src/data/decoration/header.h @@ -1,10 +1,3 @@ -// -// Created by scott on 10/21/2017. -// - -#ifndef GUARD_DATA_DECORATION_HEADER_H -#define GUARD_DATA_DECORATION_HEADER_H - const struct Decoration gDecorations[] = { { DECOR_NONE, @@ -1096,5 +1089,3 @@ const struct Decoration gDecorations[] = { DecorDesc_REGISTEEL_DOLL, DecorGfx_REGISTEEL_DOLL} }; - -#endif //GUARD_DATA_DECORATION_HEADER_H |