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/pmacct/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/pmacct') diff --git a/package/pmacct/Makefile b/package/pmacct/Makefile index f793a8e45..c90d993c2 100644 --- a/package/pmacct/Makefile +++ b/package/pmacct/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= pmacct PKG_VERSION:= 0.12.5 PKG_RELEASE:= 1 PKG_MD5SUM:= 3d10f9301a17f034a0f221490a99a5d0 -PKG_DESCR:= IP accounting daemons -PKG_SECTION:= net/misc +PKG_DESCR:= ip accounting tools +PKG_SECTION:= net/acct PKG_DEPENDS:= libpcap PKG_BUILDDEP:= libpcap PKG_URL:= http://www.pmacct.net/ -- cgit v1.2.3