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/keychain/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/keychain/Makefile') diff --git a/package/keychain/Makefile b/package/keychain/Makefile index 55450d892..262a44ab9 100644 --- a/package/keychain/Makefile +++ b/package/keychain/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= keychain PKG_VERSION:= 2.7.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 07c622833192189f483cbaec287f9704 -PKG_DESCR:= manage ssh and GPG keys in a secure manner -PKG_SECTION:= crypto +PKG_DESCR:= manage ssh and gpg keys in a secure manner +PKG_SECTION:= app/crypto PKG_URL:= http://www.funtoo.org/en/security/keychain/intro/ PKG_SITES:= http://www.funtoo.org/archive/keychain/ -- cgit v1.2.3