Commit 826e5d6f authored by Drake's avatar Drake

Merge branch 'testing' of gitorious.org:chakra-packages/apps into testing

parents d5165018 a26574b4
......@@ -27,3 +27,7 @@ package() {
sed -i -e '1 s/python/python2/' "${pkgdir}/usr/share/apps/plasma/plasmoids/veromix-plasmoid/dbus-service/VeromixServiceMain.py"
}
<<<<<<< HEAD
# vim:set ts=2 sw=2 et:
=======
>>>>>>> 3f0e67e3d082d761b102e94d9e8e4d85b2c55a92
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment