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/qemu/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/qemu')

diff --git a/package/qemu/Makefile b/package/qemu/Makefile
index c7b486509..6e8f23005 100644
--- a/package/qemu/Makefile
+++ b/package/qemu/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:=		1.7.1
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		9541063d999cf9659ed7fdce71314f31
 PKG_DESCR:=		cpu and system emulator
-PKG_SECTION:=		misc
+PKG_SECTION:=		sys/misc
 PKG_DEPENDS:=		zlib glib
 PKG_BUILDDEP:=		gettext-tiny libiconv-tiny
 PKG_BUILDDEP+=		zlib glib
-- 
cgit v1.2.3