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/libjson/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/libjson') diff --git a/package/libjson/Makefile b/package/libjson/Makefile index 6520bd419..fcb4ba93a 100644 --- a/package/libjson/Makefile +++ b/package/libjson/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= libjson PKG_VERSION:= 7.6.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 82f3fcbf9f8cf3c4e25e1bdd77d65164 -PKG_DESCR:= JSON library -PKG_SECTION:= libs +PKG_DESCR:= json library +PKG_SECTION:= libs/data PKG_URL:= http://sourceforge.net/projects/libjson/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libjson/} PKG_OPTS:= dev -- cgit v1.2.3