From fcfce8c04b912e79644ee281d27120d40cc2e0df Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Fri, 30 Nov 2012 17:47:05 +0100 Subject: Fix merge error. --- extra/avahi/PKGBUILD | 1 - 1 file changed, 1 deletion(-) (limited to 'extra/avahi') diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index a4f008413..3f8891030 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -10,7 +10,6 @@ url='http://www.avahi.org/' license=('LGPL') arch=('i686' 'x86_64' 'mips64el') options=('!libtool' '!emptydirs') -<<<<<<< HEAD depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm') optdepends=('dbus: communicating with client applications' 'gtk3: avahi-discover-standalone, bshell, bssh, bvnc' -- cgit v1.2.3-54-g00ecf