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/iptables/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 766ff2063..553f52ca3 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.4.21 PKG_RELEASE:= 6 PKG_MD5SUM:= 536d048c8e8eeebcd9757d0863ebb0c0 PKG_DESCR:= netfilter firewalling software -PKG_SECTION:= firewall +PKG_SECTION:= net/firewall PKG_DEPENDS:= libnetfilter_conntrack libmnl libnfnetlink PKG_BUILDDEP:= autotool libnetfilter_conntrack PKG_URL:= http://www.netfilter.org/ -- cgit v1.2.3