[oe-commits] Koen Kooi : gnome-keyring: fix merge error

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 7457196b2069b189f9c25a0d2f90e84df219f184
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=7457196b2069b189f9c25a0d2f90e84df219f184

Author: Koen Kooi <koen at openembedded.org>
Date:   Thu Sep  3 10:23:48 2009 +0200

gnome-keyring: fix merge error

---

 recipes/gnome/gnome-keyring_2.26.0.bb |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/recipes/gnome/gnome-keyring_2.26.0.bb b/recipes/gnome/gnome-keyring_2.26.0.bb
index abec0f1..b954d1a 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"