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/conntrack-tools/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/conntrack-tools/Makefile') diff --git a/package/conntrack-tools/Makefile b/package/conntrack-tools/Makefile index f5a00864b..f6c81d0a6 100644 --- a/package/conntrack-tools/Makefile +++ b/package/conntrack-tools/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.4.2 PKG_RELEASE:= 1 PKG_MD5SUM:= b1f9d006e7bf000a77395ff7cd3fac16 PKG_DESCR:= connection tracking userspace tools -PKG_SECTION:= firewall +PKG_SECTION:= net/firewall PKG_DEPENDS:= libtirpc libnetfilter_queue libnetfilter-conntrack libnetfilter-cttimeout libnetfilter-cthelper libmnl PKG_BUILDDEP:= libtirpc libnetfilter_queue libnetfilter_conntrack libnetfilter_cttimeout libnetfilter_cthelper libmnl PKG_URL:= http://conntrack-tools.netfilter.org/ -- cgit v1.2.3