diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-30 17:47:05 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-30 17:47:05 +0100 |
| commit | fcfce8c04b912e79644ee281d27120d40cc2e0df (patch) | |
| tree | 3ec89fe7c75d24170121ffc44df9d0ea0ea7dd6d /extra/avahi | |
| parent | 704027491dc998e68dc1ac8e173bb0647ec8512e (diff) | |
Fix merge error.
Diffstat (limited to 'extra/avahi')
| -rw-r--r-- | extra/avahi/PKGBUILD | 1 |
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' |