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

Ronald van Haren ronald at archlinux.org
Wed Oct 22 13:07:38 EDT 2008


    Date: Wednesday, October 22, 2008 @ 13:07:38
  Author: ronald
Revision: 16855

fix svn merge error

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

----------+
 PKGBUILD |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)


Property changes on: r/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /r/trunk:1-11703
   + /r/trunk:1-16854

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-10-22 17:06:03 UTC (rev 16854)
+++ extra-x86_64/PKGBUILD	2008-10-22 17:07:38 UTC (rev 16855)
@@ -4,7 +4,7 @@
 # Contributor: K. Piche <kpiche at rogers.com>
 
 pkgname=r
-pkgver=2.7.2
+pkgver=2.8.0
 pkgrel=1
 pkgdesc="R is a language and environment for statistical computing and graphics"
 arch=("i686" "x86_64")
@@ -15,14 +15,9 @@
 source=(http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz
 	r.desktop
 	r.png)
-<<<<<<< .working
-md5sums=('9eaee3eceec1d5f72cea5640ca90768c' 'f6d54d32e510d90c748a0d16d2abcbdc'\
-         '00659f39e90627fe87f1645df5d4e3a7')
-=======
-md5sums=('6122945e9301825b97a506151b3cefde'
+md5sums=('5213c9644aec984278b669df1a63a2ce'
          'f6d54d32e510d90c748a0d16d2abcbdc'
          '00659f39e90627fe87f1645df5d4e3a7')
->>>>>>> .merge-right.r11703
 
 build() {
    cd $srcdir/R-${pkgver}




More information about the arch-commits mailing list