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/json-glib/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/json-glib') diff --git a/package/json-glib/Makefile b/package/json-glib/Makefile index f293c8384..5514344a7 100644 --- a/package/json-glib/Makefile +++ b/package/json-glib/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= json-glib PKG_VERSION:= 0.14.2 PKG_RELEASE:= 1 PKG_MD5SUM:= 2a22832c4654156a35b38ee027f6f065 -PKG_DESCR:= a library providing serialization and deserialization support for the JavaScript Object Notation (JSON) format -PKG_SECTION:= libs +PKG_DESCR:= library providing serialization and deserialization support for the json format +PKG_SECTION:= libs/data PKG_URL:= https://wiki.gnome.org/JsonGlib/ PKG_SITES:= http://ftp.gnome.org/pub/GNOME/sources/json-glib/0.14/ PKG_OPTS:= dev -- cgit v1.2.3