[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 06373e2f84b7ac5d14926110d14932adffc6c1e0
Author: ohli <ohli at workuta.(none)>
Date:   Wed Nov 19 22:36:51 2008 +0100

    last conflict

diff --git a/setup.py b/setup.py
index c8d3ec0..d6056f9 100755
--- a/setup.py
+++ b/setup.py
@@ -22,10 +22,6 @@
 from distutils.core import setup
 import os
 from glob import glob
-<<<<<<< HEAD:setup.py
-
-=======
->>>>>>> upstream/0.6:setup.py
 
 setup(name='openmoko-panel-plugin',
         description='Panel Plugin to display the openmoko FR powerstates',

-- 
openmoko panel plugin