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

(limited to 'package/classpath')

diff --git a/package/classpath/Makefile b/package/classpath/Makefile
index 4475acf02..7e43f23b3 100644
--- a/package/classpath/Makefile
+++ b/package/classpath/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:=		classpath
 PKG_VERSION:=		0.98
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		90c6571b8b0309e372faa0f9f6255ea9
-PKG_DESCR:=		GNU Classpath
-PKG_SECTION:=		lang
+PKG_DESCR:=		java classpath
+PKG_SECTION:=		dev/tools
 PKG_BUILDDEP:=		gtk+ gdk-pixbuf orbit2 gconf
 PKG_DEPENDS:=		libgtk gdk-pixbuf orbit2 gconf
 PKG_URL:=		http://www.gnu.org/software/classpath/home.html
-- 
cgit v1.2.3