[arch-commits] Commit in fwupd/trunk (PKGBUILD)

[Bruno Pagani]

    Date: Wednesday, July 5, 2017 @ 09:17:22
  Author: archange
Revision: 242387

upgpkg: fwupd 0.9.5-2

Fix my mess

Modified:
  fwupd/trunk/PKGBUILD

----------+
 PKGBUILD |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-05 08:59:54 UTC (rev 242386)
+++ PKGBUILD	2017-07-05 09:17:22 UTC (rev 242387)
@@ -4,7 +4,7 @@
 
 pkgname=fwupd
 pkgver=0.9.5
-pkgrel=1
+pkgrel=2
 pkgdesc='A simple daemon to allow session software to update firmware'
 arch=('i686' 'x86_64')
 url='https://github.com/hughsie/fwupd'
@@ -36,13 +36,8 @@
 
 package() {
     DESTDIR="${pkgdir}" ninja -C build install
-<<<<<<< .mine
+    # Fixup mode to match polkit
+    install -d -o root -g 102 -m 750 "${pkgdir}/usr/share/polkit-1/rules.d"
     # Remove the tests
     rm -r ${pkgdir}/usr/share/installed-tests/
-||||||| .r239021
-=======
-
-    # Fixup mode to match polkit
-    install -d -o root -g 102 -m 750 "${pkgdir}/usr/share/polkit-1/rules.d"
->>>>>>> .r242380
 }