Revision: 2327
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2327
Author:   phcoder
Date:     2009-06-15 21:09:41 +0000 (Mon, 15 Jun 2009)
Log Message:
-----------
Removed bogus >>>> from ChangeLog

Modified Paths:
--------------
    trunk/grub2/ChangeLog

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-06-15 21:06:58 UTC (rev 2326)
+++ trunk/grub2/ChangeLog       2009-06-15 21:09:41 UTC (rev 2327)
@@ -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  <[email protected]>
 
        * io/gzio.c (test_header): Don't reuse one buffer for all data.



Reply via email to