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/PKGBUILD7
1 files changed, 6 insertions, 1 deletions
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index 54ffb9e06..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')
@@ -16,7 +21,7 @@ install=${pkgname}.install
makedepends=(librelib)
source=(blacklist-${_gitver}.txt::https://projects.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_gitver})
#source=(blacklist-${_gitver}.txt::https://lukeshu.com/git/mirror/parabola/blacklist.git/plain/blacklist.txt?id=${_gitver})
-md5sums=('3ea6c23b5dbc39dee4582de0c7744cb8')
+md5sums=('277564a425ed9a868d932100450844fe')
package() {
cd "$srcdir"