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/libgssglue/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/libgssglue/Makefile') diff --git a/package/libgssglue/Makefile b/package/libgssglue/Makefile index bfa2b1c92..8a4293b6c 100644 --- a/package/libgssglue/Makefile +++ b/package/libgssglue/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= libgssglue PKG_VERSION:= 0.3 PKG_RELEASE:= 2 PKG_MD5SUM:= 48aaad11b7371ba3270faa322202c038 -PKG_DESCR:= GSS glue library for NFSv4 -PKG_SECTION:= libs +PKG_DESCR:= gss glue library for nfsv4 +PKG_SECTION:= libs/net PKG_SITES:= http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/ PKG_OPTS:= dev -- cgit v1.2.3