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/joe/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'package/joe')

diff --git a/package/joe/Makefile b/package/joe/Makefile
index 1b3b0c636..417915ac9 100644
--- a/package/joe/Makefile
+++ b/package/joe/Makefile
@@ -8,15 +8,15 @@ PKG_VERSION:=		3.7
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		66de1b073e869ba12abbfcde3885c577
 PKG_DESCR:=		small editor
-PKG_SECTION:=		editor
+PKG_SECTION:=		app/editor
 PKG_URL:=		http://joe-editor.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=joe-editor/}
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 PKG_FLAVOURS_JOE:=	LANGUAGE SYNTAX
-PKGFD_LANGUAGE:=	Install translation files
-PKGFD_SYNTAX:=		Install syntax highlighting files
+PKGFD_LANGUAGE:=	install translation files
+PKGFD_SYNTAX:=		install syntax highlighting files
 
 include ${TOPDIR}/mk/package.mk
 
-- 
cgit v1.2.3