[arch-commits] Commit in xfce4-dev-tools/repos/extra-i686 (PKGBUILD)

[andyrtr at archlinux.org]

    Date: Saturday, February 28, 2009 @ 07:05:31
  Author: andyrtr
Revision: 28225

fix svn conflict

Modified:
  xfce4-dev-tools/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-02-28 12:04:50 UTC (rev 28224)
+++ PKGBUILD	2009-02-28 12:05:31 UTC (rev 28225)
@@ -1,10 +1,5 @@
-<<<<<<< .working
 # $Id$
-# Maintainer: aurelien <aurelien at archlinux.org>
-=======
-# $Id$
 # Maintainer: Tobias Kieslich <tobias funnychar archlinux.org>
->>>>>>> .merge-right.r28095
 
 pkgname=xfce4-dev-tools
 pkgver=4.6.0
@@ -27,3 +22,4 @@
   make || return 1
   make DESTDIR=${startdir}/pkg install || return 1
 }
+