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/collectd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/collectd') diff --git a/package/collectd/Makefile b/package/collectd/Makefile index bee32f073..c47168d12 100644 --- a/package/collectd/Makefile +++ b/package/collectd/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 5.4.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 6514ab3f7fd2135d2713f1ab25068841 PKG_DESCR:= system statistics collection daemon -PKG_SECTION:= misc +PKG_SECTION:= sys/misc PKG_BUILDDEP:= libtool PKG_DEPENDS:= libpthread libltdl PKG_URL:= http://collectd.org/ -- cgit v1.2.3