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

[Antonio Rojas]

    Date: Saturday, April 11, 2015 @ 12:04:09
  Author: arojas
Revision: 236256

Fix bad merge

Modified:
  calligra/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-11 10:00:43 UTC (rev 236255)
+++ PKGBUILD	2015-04-11 10:04:09 UTC (rev 236256)
@@ -21,11 +21,7 @@
          'calligra-stage'
          'calligra-words')
 pkgver=2.9.2
-<<<<<<< .mine
 pkgrel=3
-=======
-pkgrel=2
->>>>>>> .r236254
 arch=('i686' 'x86_64')
 url='http://www.calligra-suite.org/'
 license=('FDL1.2' 'GPL2' 'LGPL')