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

[Antonio Rojas]

    Date: Saturday, April 11, 2015 @ 12:00:43
  Author: arojas
Revision: 236255

Doc move rebuild

Modified:
  calligra/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-11 08:39:50 UTC (rev 236254)
+++ PKGBUILD	2015-04-11 10:00:43 UTC (rev 236255)
@@ -21,7 +21,11 @@
          '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')