From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/ulogd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/ulogd') diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile index 463716d0a..e5e92414e 100644 --- a/package/ulogd/Makefile +++ b/package/ulogd/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 2.0.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 7c71ec460dfea5287eba27472c521ebc PKG_DESCR:= netfilter userspace logging daemon -PKG_SECTION:= firewall +PKG_SECTION:= net/firewall PKG_DEPENDS:= iptables libnetfilter-conntrack libnetfilter-log libnetfilter-acct libmnl PKG_BUILDDEP:= iptables libnetfilter_conntrack libnetfilter_log libnetfilter_acct libmnl PKG_BUILDDEP+= autotool -- cgit v1.2.3