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/libnfsidmap/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/libnfsidmap') diff --git a/package/libnfsidmap/Makefile b/package/libnfsidmap/Makefile index 2881c1a90..62136594a 100644 --- a/package/libnfsidmap/Makefile +++ b/package/libnfsidmap/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= libnfsidmap PKG_VERSION:= 0.25 PKG_RELEASE:= 3 PKG_MD5SUM:= 2ac4893c92716add1a1447ae01df77ab -PKG_DESCR:= idmap library for NFSv4 -PKG_SECTION:= libs +PKG_DESCR:= idmap library for nfsv4 +PKG_SECTION:= libs/net PKG_URL:= http://www.citi.umich.edu/projects/nfsv4/linux/ PKG_SITES:= http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/ PKG_OPTS:= dev -- cgit v1.2.3