Removed bogus >>>> from ChangeLog

diff --git a/ChangeLog b/ChangeLog
index df404336ef2031c9c78fadfe5eaeb7de33d01412..893bfdf167f9686abf59b4302d1c7cfb86d54cbd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -132,7 +132,6 @@
        * loader/i386/multiboot.c (grub_multiboot_get_bootdev): likewise
        * loader/i386/pc/chainloader.c (grub_chainloader_cmd): likewise
 
->>>>>>> .r2306
 2009-06-10  Pavel Roskin  <proski@gnu.org>
 
        * io/gzio.c (test_header): Don't reuse one buffer for all data.