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

[andyrtr at archlinux.org]

    Date: Saturday, October 4, 2008 @ 08:38:02
  Author: andyrtr
Revision: 14163

fix merging conflict

Modified:
  jpilot/repos/extra-x86_64/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-10-04 12:32:44 UTC (rev 14162)
+++ PKGBUILD	2008-10-04 12:38:02 UTC (rev 14163)
@@ -1,10 +1,5 @@
-<<<<<<< .working
 # $Id$
-# Maintainer: dale <dale at archlinux.org>
-=======
-# $Id$
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
->>>>>>> .merge-right.r14142
 
 pkgname=jpilot
 pkgver=1.6.0