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/shorewall-common/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/shorewall-common') diff --git a/package/shorewall-common/Makefile b/package/shorewall-common/Makefile index 8d2dc52fc..72742a3fb 100644 --- a/package/shorewall-common/Makefile +++ b/package/shorewall-common/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 4.0.7 PKG_RELEASE:= 2 PKG_MD5SUM:= 2df43356b1fdbc91920d48c5595aa101 PKG_DESCR:= high-level netfilter configuration tool -PKG_SECTION:= firewall +PKG_SECTION:= net/firewall PKG_DEPENDS:= iptables PKG_URL:= http://www.shorewall.net PKG_SITES:= http://www1.shorewall.net/pub/shorewall/4.0/shorewall-${PKG_VERSION}/ -- cgit v1.2.3