[oe-commits] Martin Jansa : checksums: fix missing merge

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sun Nov  8 18:14:26 2009 +0100

checksums: fix missing merge

---

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

diff --git a/conf/checksums.ini b/conf/checksums.ini
index de6ae91..96a2bd8 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -26866,13 +26866,10 @@ sha256=16971189b3cb95648b9574eb7c4c7cc0dff9978458aff7f3f7c54ab823ada721
 md5=7d11fcddb2bd30b9ecbdacfaa20f2769
 sha256=ebb1afbb0a61dd8f5f8ef13512e789697e98d5ad5f98739120f3b3cc02d46d8f
 
-<<<<<<< HEAD
-=======
 [http://download.gnome.org/sources/vala/0.7/vala-0.7.8.tar.bz2]
 md5=accd0d350c6d6de7527a0a65c40f8be2
 sha256=b2daf636d95ef66ffd5132eacf18335073b71bfaa18f7ad06f25bcf9673aa747
 
->>>>>>> origin/org.openembedded.dev
 [http://ftp.acc.umu.se/pub/GNOME/sources/vala/0.7/vala-0.7.8.tar.bz2]
 md5=accd0d350c6d6de7527a0a65c40f8be2
 sha256=b2daf636d95ef66ffd5132eacf18335073b71bfaa18f7ad06f25bcf9673aa747