summaryrefslogtreecommitdiff
path: root/extra/avahi
diff options
context:
space:
mode:
Diffstat (limited to 'extra/avahi')
-rw-r--r--extra/avahi/PKGBUILD1
1 files changed, 0 insertions, 1 deletions
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'