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/ipset/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/ipset/Makefile') diff --git a/package/ipset/Makefile b/package/ipset/Makefile index 34fea7f21..cffee986d 100644 --- a/package/ipset/Makefile +++ b/package/ipset/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 4.1 PKG_RELEASE:= 1 PKG_MD5SUM:= d104007fdf5ea64fef774c22b1c0a97b PKG_DESCR:= ip sets administration utility -PKG_SECTION:= firewall +PKG_SECTION:= net/firewall PKG_URL:= http://ipset.netfilter.org/ PKG_SITES:= http://ipset.netfilter.org/ -- cgit v1.2.3