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/zsh/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/zsh') diff --git a/package/zsh/Makefile b/package/zsh/Makefile index d375028b7..91e3567f9 100644 --- a/package/zsh/Makefile +++ b/package/zsh/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= zsh PKG_VERSION:= 5.0.5 PKG_RELEASE:= 1 PKG_MD5SUM:= 6fb0e3e52a0f8de5ca63138391b81ce0 -PKG_DESCR:= Z Shell -PKG_SECTION:= shells +PKG_DESCR:= z shell +PKG_SECTION:= base/shells PKG_URL:= http://www.zsh.org/ PKG_SITES:= ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/ -- cgit v1.2.3