gnome-keyring: fix merge error
authorKoen Kooi <koen@openembedded.org>
Thu, 3 Sep 2009 08:23:48 +0000 (10:23 +0200)
committerKoen Kooi <koen@openembedded.org>
Thu, 3 Sep 2009 08:23:48 +0000 (10:23 +0200)
commit7457196b2069b189f9c25a0d2f90e84df219f184
treeca80ecafccd8f3b8bc3feb8ba869f47a177fb979
parentc73cd5fdeb25c5cd4cfa316e2dd59304a776f7af
gnome-keyring: fix merge error
recipes/gnome/gnome-keyring_2.26.0.bb