From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 29 May 2014 11:40:49 +0200
Subject: resolve merge conflict

---
 package/m4/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/m4/Makefile')

diff --git a/package/m4/Makefile b/package/m4/Makefile
index 867903f70..37ee750f3 100644
--- a/package/m4/Makefile
+++ b/package/m4/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:=		1.4.17
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		12a3c829301a4fd6586a57d3fcf196dc
 PKG_DESCR:=		macro processor
-PKG_SECTION:=		lang
+PKG_SECTION:=		dev/tools
 PKG_BUILDDEP:=		m4-host
 HOST_BUILDDEP:=		xz-host
 PKG_URL:=		http://www.gnu.org/software/m4/
-- 
cgit v1.2.3