diff options
Diffstat (limited to 'src/map/trade.h')
| -rw-r--r-- | src/map/trade.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/map/trade.h b/src/map/trade.h index 6bcefdb96..ba56872c2 100644 --- a/src/map/trade.h +++ b/src/map/trade.h @@ -1,10 +1,10 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL -// For more information, see LICENCE in the main folder +// Copyright (c) Hercules Dev Team, licensed under GNU GPL. +// See the LICENSE file +// Portions Copyright (c) Athena Dev Teams #ifndef _TRADE_H_ #define _TRADE_H_ -//#include "map.h" struct map_session_data; struct trade_interface { @@ -20,6 +20,11 @@ struct trade_interface { } trade_s; struct trade_interface *trade; +<<<<<<< HEAD void trade_interface(void); +======= + +void trade_defaults(void); +>>>>>>> upstream/master #endif /* _TRADE_H_ */ |