diff options
author | camthesaxman <cameronghall@cox.net> | 2017-07-06 19:28:57 -0500 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2017-07-06 19:28:57 -0500 |
commit | 4aa1b44315ee26fa60015a99ccd51f900e5597fd (patch) | |
tree | fdcac19f28b2e4febd96a895e72fce122b9e3b15 /include/pokeblock_feed.h | |
parent | ad7a7222a538380b446f9aecde44c5222ff3b68a (diff) | |
parent | e39f55f55080108ced3ff5cb16b2181d7fec9d92 (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 |