diff options
Diffstat (limited to 'src/map/trade.h')
| -rw-r--r-- | src/map/trade.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/map/trade.h b/src/map/trade.h index ba56872c2..8bf918ad2 100644 --- a/src/map/trade.h +++ b/src/map/trade.h @@ -20,11 +20,7 @@ struct trade_interface { } trade_s; struct trade_interface *trade; -<<<<<<< HEAD -void trade_interface(void); -======= void trade_defaults(void); ->>>>>>> upstream/master #endif /* _TRADE_H_ */ |