Merge pull request #58 from IKRadulov/patch-1

Fixed file conflict
rilian-la-te · Apr 1, 2017 · 86fc046 · 86fc046
2 parents c698ed7 + 8610dc7
commit 86fc046
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD
@@ -98,6 +98,7 @@ package_vala-panel-appmenu-xfce-git() {
   rm -rf "${pkgdir}/usr/lib/vala-panel"
   rm -rf "${pkgdir}/usr/lib/mate-panel"
   rm -rf "${pkgdir}/usr/share/mate-panel"
+  rm -rf "${pkgdir}/usr/share/dbus-1"
 }
 
 package_vala-panel-appmenu-valapanel-git() {