From: Koen Kooi <koen@openembedded.org>
Date: Thu, 3 Sep 2009 08:23:48 +0000 (+0200)
Subject: gnome-keyring: fix merge error
X-Git-Tag: Release-2010-05/1~2541
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7457196b2069b189f9c25a0d2f90e84df219f184;p=openembedded.git

gnome-keyring: fix merge error
---

diff --git a/recipes/gnome/gnome-keyring_2.26.0.bb b/recipes/gnome/gnome-keyring_2.26.0.bb
index abec0f1b38..b954d1af76 100644
--- a/recipes/gnome/gnome-keyring_2.26.0.bb
+++ b/recipes/gnome/gnome-keyring_2.26.0.bb
@@ -3,7 +3,6 @@ SECTION = "x11/gnome"
 
 inherit autotools gnome pkgconfig
 
-DEPENDS = "gconf-dbus gtk+ libtasn1 libtasn1-native libgcrypt"
 DEPENDS = " libpam gconf gtk+ libtasn1 libtasn1-native libgcrypt"
 
 EXTRA_OECONF = "--disable-gtk-doc"