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/openafs/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/openafs') diff --git a/package/openafs/Makefile b/package/openafs/Makefile index b0a2b5d83..99e091181 100644 --- a/package/openafs/Makefile +++ b/package/openafs/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= openafs PKG_VERSION:= 1.6.5.1 PKG_RELEASE:= 1 PKG_MD5SUM:= e33e0b031760d4f90815d40b8ab3c540 -PKG_DESCR:= AFS implementation +PKG_DESCR:= afs implementation PKG_SECTION:= net/fs PKG_URL:= http://openafs.org PKG_SITES:= http://www.openafs.org/dl/openafs/${PKG_VERSION}/ -- cgit v1.2.3