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/fprobe/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/fprobe') diff --git a/package/fprobe/Makefile b/package/fprobe/Makefile index ba361e81e..f11ceff83 100644 --- a/package/fprobe/Makefile +++ b/package/fprobe/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= fprobe PKG_VERSION:= 1.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 65850d0470078269b33eee58cba77ac2 -PKG_DESCR:= NetFlow probe -PKG_SECTION:= net +PKG_DESCR:= netflow probe +PKG_SECTION:= net/acct PKG_DEPENDS:= libpcap libpthread PKG_BUILDDEP:= libpcap PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=fprobe/} -- cgit v1.2.3