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/netstat-nat/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/netstat-nat') diff --git a/package/netstat-nat/Makefile b/package/netstat-nat/Makefile index 1d6874a92..78feb7df0 100644 --- a/package/netstat-nat/Makefile +++ b/package/netstat-nat/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= netstat-nat PKG_VERSION:= 1.4.9 PKG_RELEASE:= 1 PKG_MD5SUM:= 45e8d0f47623f619c22a6b894cd03cbc -PKG_DESCR:= netstat variant for NAT connections -PKG_SECTION:= firewall +PKG_DESCR:= netstat variant for nat connections +PKG_SECTION:= net/firewall PKG_URL:= http://www.tweegy.nl/projects/netstat-nat/index.html PKG_SITES:= http://www.tweegy.nl/download/ -- cgit v1.2.3