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/libjansson/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/libjansson') diff --git a/package/libjansson/Makefile b/package/libjansson/Makefile index 4fef0dd4b..5213bbaef 100644 --- a/package/libjansson/Makefile +++ b/package/libjansson/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= libjansson PKG_VERSION:= 2.5 PKG_RELEASE:= 1 PKG_MD5SUM:= 46ac93bec48aacf207b67b51c8fbf7f1 -PKG_DESCR:= JSON library -PKG_SECTION:= libs +PKG_DESCR:= json library +PKG_SECTION:= libs/data PKG_URL:= http://www.digip.org/jansson/ PKG_SITES:= http://www.digip.org/jansson/releases/ PKG_OPTS:= dev -- cgit v1.2.3