diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-07-07 16:54:14 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-07-07 16:54:14 -0500 |
| commit | f719abf104e304ed2f886a413d1132a75e3379b1 (patch) | |
| tree | 352be6d36f1db3f697394bc193adb7fa8142be71 /src/pokenav.c | |
| parent | 2d604191592fbac2618d4a626f61ff1423cac828 (diff) | |
| parent | bd4a6520eaaaac186b6b26557305be8939a7ea2a (diff) | |
fix merge conflicts
Diffstat (limited to 'src/pokenav.c')
| -rw-r--r-- | src/pokenav.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/pokenav.c b/src/pokenav.c index 3a386d865..84ed7b14b 100644 --- a/src/pokenav.c +++ b/src/pokenav.c @@ -1,4 +1,5 @@ #include "global.h" +#include "main.h" #include "pokenav.h" #include "battle.h" #include "data2.h" |