diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
| commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
| tree | 7617315e619f969c13e79c1f44c2428871719357 /package/zsh | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/zsh')
| -rw-r--r-- | package/zsh/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
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/ |