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/bash/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/bash/Makefile') diff --git a/package/bash/Makefile b/package/bash/Makefile index be6d96911..3e2e3994c 100644 --- a/package/bash/Makefile +++ b/package/bash/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= bash PKG_VERSION:= 4.3 PKG_RELEASE:= 1 PKG_MD5SUM:= 81348932d5da294953e15d4814c74dd1 -PKG_DESCR:= Bourne-Again SHell -PKG_SECTION:= shells +PKG_DESCR:= bourne-again shell +PKG_SECTION:= base/shells PKG_URL:= http://www.gnu.org/software/bash/ PKG_SITES:= http://ftp.gnu.org/gnu/bash/ -- cgit v1.2.3