1 files changed, 10 insertions, 0 deletions
diff --git a/src/gui/buysell.h b/src/gui/buysell.h
index 0842c0e1..c6989709 100644
--- a/src/gui/buysell.h
+++ b/src/gui/buysell.h
@@ -46,6 +46,16 @@ class BuySellDialog : public Window, public gcn::ActionListener
         BuySellDialog(Network *network);
 
         /**
+<<<<<<< HEAD:src/gui/buysell.h
+=======
+         * Check for current NPC
+         */
+        void logic();
+
+        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);