From 05d715df3ac052fb41a5ab42369d05a3e2a82de3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 13 May 2014 13:44:08 +0200 Subject: resolve merge conflict --- package/libvirt/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'package/libvirt') diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile index 0e6b22af2..b5a1ecf0f 100644 --- a/package/libvirt/Makefile +++ b/package/libvirt/Makefile @@ -11,8 +11,7 @@ PKG_DESCR:= virtualization API PKG_SECTION:= libs PKG_BUILDDEP:= libxml2 gnutls python2 libpcap parted eudev PKG_DEPENDS:= libxml2 libgnutls python2 libpcap libreadline -PKG_DEPENDS+= dmidecode kmod-netfilter-xt-target-checksum -PKG_DEPENDS+= dnsmasq qemu libnl libudev +PKG_DEPENDS+= dmidecode dnsmasq qemu libnl libudev PKG_URL:= http://www.libvirt.org/ PKG_SITES:= http://libvirt.org/sources/ PKG_OPTS:= dev -- cgit v1.2.3