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/jikes/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/jikes')

diff --git a/package/jikes/Makefile b/package/jikes/Makefile
index be7e6a749..e321d2a5c 100644
--- a/package/jikes/Makefile
+++ b/package/jikes/Makefile
@@ -7,9 +7,9 @@ PKG_NAME:=		jikes
 PKG_VERSION:=		1.22
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		cda958c7fef6b43b803e1d1ef9afcb85
-PKG_DESCR:=		jikes java compiler
+PKG_DESCR:=		java compiler
 PKG_BUILDDEP:=		jikes-host
-PKG_SECTION:=		lang
+PKG_SECTION:=		dev/lang
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/}
 
 DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.bz2
-- 
cgit v1.2.3