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/openobex/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/openobex') diff --git a/package/openobex/Makefile b/package/openobex/Makefile index 541ca79c3..c8c21dd6f 100644 --- a/package/openobex/Makefile +++ b/package/openobex/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= openobex PKG_VERSION:= 1.5 PKG_RELEASE:= 2 PKG_MD5SUM:= 0d83dc86445a46a1b9750107ba7ab65c -PKG_DESCR:= implementation of the Object Exchange (OBEX) protocol -PKG_SECTION:= misc +PKG_DESCR:= implementation of the obex protocol +PKG_SECTION:= sys/misc PKG_URL:= http://dev.zuckschwerdt.org/openobex/wiki/WikiStart PKG_SITES:= ${MASTER_SITE_KERNEL:=bluetooth/} PKG_OPTS:= dev -- cgit v1.2.3