[pkg-fso-commits] [SCM] openmoko panel plugin branch, debian, updated. debian/0.5-1.3-5-g3dda18c

[ohli (none)]

The following commit has been merged in the debian branch:
commit 3dda18c9da8c92963e910cb35c3b61c0bb67f417
Author: ohli <ohli at workuta.(none)>
Date:   Wed Nov 19 22:46:29 2008 +0100

    the last conflict

diff --git a/openmoko-panel-plugin b/openmoko-panel-plugin
index 8075cba..244aff4 100755
--- a/openmoko-panel-plugin
+++ b/openmoko-panel-plugin
@@ -726,15 +726,9 @@ class GSMIcon( UsageIcon ):
                 sendNofication = True
 
         if (sendNofication):
-<<<<<<< HEAD:openmoko-panel-plugin
-            if (notificationAvailable):
-                self.gsmStatusChanged = True
-                self.sendNotification()
-=======
             self.gsmStatusChanged = True
             if (notificationAvailable):
                 self.commitNotification()
->>>>>>> upstream/0.6:openmoko-panel-plugin
 
         self.updateIcon()
     

-- 
openmoko panel plugin