[oe-commits] Koen Kooi : checksums: fix git merge damage, sorry about that

[git version control]

Module: openembedded.git
Branch: shr/unstable
Commit: b377f83fde485aa4f1bf3f99e907d89bfdd7686d
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=b377f83fde485aa4f1bf3f99e907d89bfdd7686d

Author: Koen Kooi <koen at openembedded.org>
Date:   Thu Feb 18 14:28:12 2010 +0100

checksums: fix git merge damage, sorry about that

---

 conf/checksums.ini |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 98dc0a5..45315e6 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -30830,15 +30830,11 @@ sha256=b308ddc96fcb27b3f18ed2fa20aeb3a12fb73cec7676d75914a58d1b27124b83
 md5=88352816c84cbea57121b0c478976976
 sha256=1d8ab1354c73935a5d12f0d7d226d26ae1b90fdd235460bdb57fd5651229bc8b
 
-<<<<<<< HEAD:conf/checksums.ini
-[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce4-session-4.4.2.tar.bz2]
-=======
 [http://archive.xfce.org/src/apps/xfce4-power-manager/0.8/xfce4-power-manager-0.8.4.2.tar.bz2]
 md5=3131257750766838a64a9bb7f74eb2a1
 sha256=16cc04bf613ecfbc9ea43514ccb5f7d7923b7fc4ebf8117c0ce32fa1422334e1
 
 [http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-session-4.4.2.tar.bz2]
->>>>>>> xfce4-power-manager: Remove broken xfce4-power-manager_4.6.1.bb and add latest 0.8.4.2 to xfce-extras.:conf/checksums.ini
 md5=4c3d1acb8ce37ea4dd55d82aeb38e9e7
 sha256=7394906dec7b50789407219f85143ae83b10938949d38adeecdd59eb50c8c1c6