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/libcroco/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/libcroco')

diff --git a/package/libcroco/Makefile b/package/libcroco/Makefile
index 8e6775354..8173e5ccb 100644
--- a/package/libcroco/Makefile
+++ b/package/libcroco/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:=		libcroco
 PKG_VERSION:=		0.6.8
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		767e73c4174f75b99695d4530fd9bb80
-PKG_DESCR:=		CSS2 parsing and manipulation library
-PKG_SECTION:=		libs
+PKG_DESCR:=		css2 parsing and manipulation library
+PKG_SECTION:=		libs/misc
 PKG_URL:=		https://github.com/GNOME/libcroco
 PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/
 PKG_OPTS:=		dev
-- 
cgit v1.2.3