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/nfs-utils/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/nfs-utils/Makefile') diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index 90ccda2c6..caffe5e67 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -23,8 +23,8 @@ PKGSD_NFS_UTILS_SERVER:=server daemons and utilities PKGSN_NFS_UTILS_SERVER:=nfs-utils PKG_CHOICES_NFS_UTILS:= V3 V4 -PKGCD_V3:= NFS version 3 -PKGCD_V4:= NFS version 4 +PKGCD_V3:= nfs version 3 +PKGCD_V4:= nfs version 4 PKGCB_V4:= libevent libnfsidmap krb5 libgssglue librpcsecgss PKGCS_V4:= libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue -- cgit v1.2.3