summaryrefslogtreecommitdiff
path: root/libre/your-freedom/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'libre/your-freedom/PKGBUILD')
-rw-r--r--libre/your-freedom/PKGBUILD5
1 files changed, 5 insertions, 0 deletions
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index 56be2c03a..13ce2069b 100644
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -5,8 +5,13 @@ pkgdesc="This package conflicts with every nonfree package known to date to ensu
license=('GPL3')
url="https://projects.parabola.nu/blacklist.git"
#url="https://lukeshu.com/git/mirror/parabola/blacklist.git"
+<<<<<<< HEAD
+pkgver=20141213
+_gitver=e20783c6f0a66fd05400ca888683f68e0278c6a7
+=======
pkgver=20141215
_gitver=883028227ea883c7ae90ac04b961b59c9daa71bb
+>>>>>>> 93dd217e948a8120899d72879def905500a8e4ea
pkgrel=1
arch=('any')