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/mdadm/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/mdadm/Makefile') diff --git a/package/mdadm/Makefile b/package/mdadm/Makefile index ee1dc5d2d..775e7aaed 100644 --- a/package/mdadm/Makefile +++ b/package/mdadm/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= mdadm PKG_VERSION:= 3.3 PKG_RELEASE:= 1 PKG_MD5SUM:= abb19b309281b93cf79d29fb2dfb2e85 -PKG_DESCR:= tool for managing Linux Software RAID arrays -PKG_SECTION:= fs +PKG_DESCR:= tool for managing software RAID arrays +PKG_SECTION:= sys/fs PKG_URL:= http://neil.brown.name/blog/mdadm PKG_SITES:= ${MASTER_SITE_KERNEL:=utils/raid/mdadm/} -- cgit v1.2.3