Fix with merging from master

diff --git a/src/UserInterface/Views/RoomStatusIndicatorWidget.h b/src/UserInterface/Views/RoomStatusIndicatorWidget.h
index 4d8966c..643160a 100644 (file)
--- a/src/UserInterface/Views/RoomStatusIndicatorWidget.h
+++ b/src/UserInterface/Views/RoomStatusIndicatorWidget.h
@@ -68,8 +68,6 @@ public slots:
        \r
        void connectionLost();\r
        \r
-       void currentRoomChanged( Room *aRoom );\r
-       \r
 private:\r
        //! Translates the status into human readable text.\r
        /*!\r