summaryrefslogtreecommitdiff
path: root/extra/gnutls
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-10-21 11:00:12 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-10-21 11:00:12 -0300
commit65d9286f54bc65d71cf50737006c9d4c08512070 (patch)
tree7bcd30eb4b3b2fb9507c8b404fae700d1d165345 /extra/gnutls
parentfadc9233d895b8ad68714fbe2693fa70293dee44 (diff)
fixes
Diffstat (limited to 'extra/gnutls')
-rw-r--r--extra/gnutls/PKGBUILD1
1 files changed, 0 insertions, 1 deletions
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 441a988e0..388da42fd 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -10,7 +10,6 @@ license=('GPL3' 'LGPL')
url="http://www.gnu.org/software/gnutls/"
install=gnutls.install
options=('!libtool' '!zipman')
-<<<<<<< HEAD
depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit')
[ "$CARCH" = "mips64el" ] || makedepends=('valgrind')
source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz