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/ed/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/ed') diff --git a/package/ed/Makefile b/package/ed/Makefile index 70a4a5d3f..66237517e 100644 --- a/package/ed/Makefile +++ b/package/ed/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.5 PKG_RELEASE:= 1 PKG_MD5SUM:= e66c03d7e4c67b025d5b6093ec678267 PKG_DESCR:= unix editor -PKG_SECTION:= editor +PKG_SECTION:= app/editor PKG_URL:= http://www.gnu.org/software/ed/ed.html PKG_SITES:= ${MASTER_SITE_GNU:=ed/} PKG_BB:= 1 -- cgit v1.2.3