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 /include/pokeblock_feed.h | |
parent | 2d604191592fbac2618d4a626f61ff1423cac828 (diff) | |
parent | bd4a6520eaaaac186b6b26557305be8939a7ea2a (diff) |
fix merge conflicts
Diffstat (limited to 'include/pokeblock_feed.h')
-rw-r--r-- | include/pokeblock_feed.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/pokeblock_feed.h b/include/pokeblock_feed.h new file mode 100644 index 000000000..65d0d1dc9 --- /dev/null +++ b/include/pokeblock_feed.h @@ -0,0 +1,10 @@ +// +// Created by Scott Norton on 6/28/17. +// + +#ifndef POKERUBY_POKEBLOCK_FEED_H +#define POKERUBY_POKEBLOCK_FEED_H + +void sub_8147ADC(void); + +#endif //POKERUBY_POKEBLOCK_FEED_H |