aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGaetan Bisson2020-01-22 08:41:31 -1000
committerGaetan Bisson2020-01-22 08:41:31 -1000
commitbdd72428ae1f96afd4f8c2aa333135b288f612ac (patch)
tree1cf5e196c3c0071f1cb6fbe5933a9a8d01b9ab07
parent4e098f52d56f00bff0cbf89819dd5efe22d32213 (diff)
parentdb29ad2d19d31d9c00b7d10cfbed24b19ebf0cfb (diff)
downloadaur-bdd72428ae1f96afd4f8c2aa333135b288f612ac.tar.gz
Merge branch 'master' of ssh://aur/buildstuff
-rw-r--r--PKGBUILD4
1 files changed, 4 insertions, 0 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 274b83d88c30..c4bdf508fa0f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,11 @@
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname=buildstuff
+<<<<<<< HEAD
pkgver=2.1
+=======
+pkgver=2.0
+>>>>>>> db29ad2d19d31d9c00b7d10cfbed24b19ebf0cfb
pkgrel=1
pkgdesc='Stuff to build packages in virtual machines'
url='http://arch.vesath.org/'