diff options
Diffstat (limited to 'src/gui/buysell.h')
| -rw-r--r-- | src/gui/buysell.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gui/buysell.h b/src/gui/buysell.h index c6989709..4b137554 100644 --- a/src/gui/buysell.h +++ b/src/gui/buysell.h @@ -1,9 +1,8 @@ /* - * Aethyra + * The Mana World * Copyright (C) 2004 The Mana World Development Team * - * This file is part of Aethyra based on original code - * from The Mana World. + * This file is part of The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -46,8 +45,6 @@ class BuySellDialog : public Window, public gcn::ActionListener BuySellDialog(Network *network); /** -<<<<<<< HEAD:src/gui/buysell.h -======= * Check for current NPC */ void logic(); @@ -55,7 +52,6 @@ class BuySellDialog : public Window, public gcn::ActionListener void setVisible(bool visible); /** ->>>>>>> f64903f... Fix up the NPC interraction widnows a bit:src/gui/buysell.h * Called when receiving actions from the widgets. */ void action(const gcn::ActionEvent &event); |