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/grep/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/grep') diff --git a/package/grep/Makefile b/package/grep/Makefile index 3666cef87..61b2acf0f 100644 --- a/package/grep/Makefile +++ b/package/grep/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 2.19 PKG_RELEASE:= 1 PKG_MD5SUM:= ac732142227d9fe9567d71301e127979 PKG_DESCR:= global search for a regex and print out matched lines -PKG_SECTION:= utils +PKG_SECTION:= base/apps PKG_DEPENDS:= libpcre PKG_BUILDDEP:= pcre PKG_URL:= http://www.gnu.org/software/grep/ -- cgit v1.2.3