diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-12-17 00:04:45 -0200 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-12-17 00:04:45 -0200 |
| commit | 541c74b3aa569a67fbe5665c0df9e62e23a090ef (patch) | |
| tree | 462db0810634baf68572d5567d8303249ca00235 /libre | |
| parent | dc86f8f474ba9189521e2df2a3c2dad3c74695ad (diff) | |
| parent | 31b5cbb19fcce977ffac296a6c8fb62c65cfdac4 (diff) | |
| download | abslibre-541c74b3aa569a67fbe5665c0df9e62e23a090ef.tar.gz abslibre-541c74b3aa569a67fbe5665c0df9e62e23a090ef.tar.bz2 abslibre-541c74b3aa569a67fbe5665c0df9e62e23a090ef.zip | |
Merge branch 'master' of ssh://projects.parabola.nu/~git/abslibre/abslibre
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/your-freedom/PKGBUILD | 5 |
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') |