From: Torste Aikio <zokier@zokier.laptop>
Date: Wed, 7 Jul 2010 08:00:30 +0000 (+0300)
Subject: Fixed a broken merge
X-Git-Url: http://vcs.maemo.org/git/?p=irwi;a=commitdiff_plain;h=5c0037c6de89d1f0c97c6d851d9d0d3813aa49bf

Fixed a broken merge
---

diff --git a/src/onlinepollerthread.cpp b/src/onlinepollerthread.cpp
index 7513b8d..6e1cdac 100644
--- 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();
 }