Fixed a broken merge

[irwi] / src / onlinepollerthread.cpp

diff --git a/src/onlinepollerthread.cpp b/src/onlinepollerthread.cpp
index 7513b8d..6e1cdac 100644 (file)
--- a/src/onlinepollerthread.cpp
+++ b/src/onlinepollerthread.cpp
@@ -18,18 +18,11 @@ void OnlinePollerThread::run()
             if (!qncm.isOnline()) {
                 msleep(250);
             } else {
-<<<<<<< HEAD
-=======
                 emit online();
->>>>>>> 2fd880d... Removed onlinepollerthread
                 break;
             }
         }
     }
-<<<<<<< HEAD
-    emit online();
-=======
->>>>>>> 2fd880d... Removed onlinepollerthread
     exec();
 }