From: Koen Kooi <koen@openembedded.org>
Date: Fri, 4 Dec 2009 10:14:49 +0000 (+0100)
Subject: font-util: fix merge damage
X-Git-Tag: Release-2010-05/1~1461
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99f78d400254c8f8a6d6a998ac72a9c49a648dd3;p=openembedded.git

font-util: fix merge damage
---

diff --git a/recipes/xorg-font/font-util-native_1.0.1.bb b/recipes/xorg-font/font-util-native_1.0.1.bb
index cb117bf957..ffcd60c8b7 100644
--- a/recipes/xorg-font/font-util-native_1.0.1.bb
+++ b/recipes/xorg-font/font-util-native_1.0.1.bb
@@ -1,4 +1,4 @@
-be inherit native
+inherit native
 require xorg-font-common.inc
 
 XORG_PN = "font-util"
diff --git a/recipes/xorg-font/font-util_1.0.1.bb b/recipes/xorg-font/font-util_1.0.1.bb
index 5a1761bf6a..4d55407ff9 100644
--- a/recipes/xorg-font/font-util_1.0.1.bb
+++ b/recipes/xorg-font/font-util_1.0.1.bb
@@ -1,4 +1,4 @@
-Qurequire xorg-font-common.inc
+require xorg-font-common.inc
 
 PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"