Confilct solved

[qtmeetings] / src / BusinessLogic / UIManager.h

diff --git a/src/BusinessLogic/UIManager.h b/src/BusinessLogic/UIManager.h
index b2ef8e5..837fd58 100644 (file)
--- a/src/BusinessLogic/UIManager.h
+++ b/src/BusinessLogic/UIManager.h
@@ -52,11 +52,6 @@ public:
         * Makes the main view visible trough WindowManager.
         */
        void showMainView();
-       //! Shows the progress bar.
-       /*!
-        * Shows the progress bar with given text.
-        */
-       void showProgressBar( QString aText );
 
 signals: