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

    resolved missing conflict

diff --git a/setup.py b/setup.py
index 68f567f..c8d3ec0 100755
--- a/setup.py
+++ b/setup.py
@@ -34,15 +34,6 @@ setup(name='openmoko-panel-plugin',
         version='0.6',
         license='GPL_v2',
         scripts=['openmoko-panel-plugin'],
-<<<<<<< HEAD:setup.py
-        data_files=[
-                ('/usr/share/pixmaps/openmoko-panel-plugin',
-                        glob('pixmaps/*.png')
-                ),
-                ('/usr/share/applications',
-                        ['openmoko-panel-plugin.desktop']
-                ),
-=======
         url='http://projects.openmoko.org/projects/panel-plugin/',
         data_files=[
                 ('/usr/share/applications',
@@ -51,7 +42,6 @@ setup(name='openmoko-panel-plugin',
                 ('/usr/share/pixmaps/openmoko-panel-plugin',
                         glob('pixmaps/*.png')
                 ),
->>>>>>> upstream/0.6:setup.py
         ],
     )
 

-- 
openmoko panel plugin