diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-17 20:22:56 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-17 20:22:56 +0100 |
| commit | 46fa2557d777096803ff90ba95d5500a9c03d2c5 (patch) | |
| tree | ded4f0e046be43e371631fca3ac013d96fa244e0 /include/mail.h | |
| parent | 930fea6fad24692773b930ec7448c59d599844b8 (diff) | |
| parent | 6d73bb4b57efb3ff81dcc2aa0d00d5de380add9e (diff) | |
merge mail with master, fix conflicts
Diffstat (limited to 'include/mail.h')
| -rw-r--r-- | include/mail.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/mail.h b/include/mail.h index 322b63b90..042586653 100644 --- a/include/mail.h +++ b/include/mail.h @@ -1,8 +1,6 @@ #ifndef GUARD_MAIL_H #define GUARD_MAIL_H -#include "items.h" - #define IS_ITEM_MAIL(itemId)((itemId == ITEM_ORANGE_MAIL \ || itemId == ITEM_HARBOR_MAIL \ || itemId == ITEM_GLITTER_MAIL \ |