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/bwm/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/bwm/Makefile') diff --git a/package/bwm/Makefile b/package/bwm/Makefile index 6f52a137c..56cc41aa9 100644 --- a/package/bwm/Makefile +++ b/package/bwm/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= bwm PKG_VERSION:= 1.1.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 51021a036acb92d2bda0c0c0483f9552 -PKG_DESCR:= A very tiny bandwidth monitor -PKG_SECTION:= net +PKG_DESCR:= very tiny bandwidth monitor +PKG_SECTION:= net/perf PKG_SITES:= http://ftp.debian.org/debian/pool/main/b/bwm/ DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.orig.tar.gz -- cgit v1.2.3