X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fonlinepollerthread.cpp;h=7513b8d034f2f8f66006e50eff935aa4d8a3b1db;hb=b101a833aec8a49ba19743222bcb85d56d68433b;hp=89cc31a2cc2626bd461638d0b725f8f0400da4ec;hpb=d9529c0b509758d2c9371b5a061e43a94af29cc2;p=irwi

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