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-shell/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/shorewall-shell/Makefile') diff --git a/package/shorewall-shell/Makefile b/package/shorewall-shell/Makefile index 96c9fbc68..3486aa487 100644 --- a/package/shorewall-shell/Makefile +++ b/package/shorewall-shell/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 4.0.14.1 PKG_RELEASE:= 1 PKG_MD5SUM:= ab61c2f3db82382351f432f783980fa7 PKG_DESCR:= shell compiler for shorewall -PKG_SECTION:= firewall +PKG_SECTION:= net/firewall PKG_URL:= http://www.shorewall.net PKG_SITES:= http://www1.shorewall.net/pub/shorewall/4.0/shorewall-4.0.14/ -- cgit v1.2.3