[arch-commits] Commit in hal/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Eric Belanger]

    Date: Saturday, August 16, 2008 @ 18:35:21
  Author: eric
Revision: 8862

fixing svn conflicts

Modified:
  hal/repos/extra-x86_64/	(properties)
  hal/repos/extra-x86_64/PKGBUILD

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


Property changes on: hal/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /hal/trunk:1-2345
   + /hal/trunk:1-8861

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-08-16 22:34:13 UTC (rev 8861)
+++ extra-x86_64/PKGBUILD	2008-08-16 22:35:21 UTC (rev 8862)
@@ -19,11 +19,9 @@
 	cryptsetup_location.patch
 	hal-0.5.9-hide-diagnostic.patch
 	ntfs3g-valid-options.patch)
-md5sums=('5e8935ab61bcb14afd2d4548084aace0'
-         '277e96ac130d7bfce0b30f0b80db8782'
-         '18dcdaa79952e2057c2e4745fbc8ad52'
-         'c688a3c6574699365926f4fef7441545'
-         '4d4b6801a1cedca22b8bdd9db73b16fb')
+md5sums=('5e8935ab61bcb14afd2d4548084aace0' '277e96ac130d7bfce0b30f0b80db8782'\
+         '18dcdaa79952e2057c2e4745fbc8ad52' 'c688a3c6574699365926f4fef7441545'\
+         '4d4b6801a1cedca22b8bdd9db73b16fb' '4242a2c78885e396f639d0cd5e33218c')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}