# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1116025781 0
# Node ID 758f5cc54b97f2cc1bee56f590ef16ba8dd56bcd
# Parent  3fa6e7b9d39742470213d9b66fc085cc92d3b18f
*** empty log message ***

diff -r 3fa6e7b9d397 -r 758f5cc54b97 src/ChangeLog
--- a/src/ChangeLog	Fri May 13 23:07:41 2005 +0000
+++ b/src/ChangeLog	Fri May 13 23:09:41 2005 +0000
@@ -51,7 +51,6 @@
 	(unexec_malloc, unexec_realloc, unexec_free): Store and use
 	allocated size information in unexec_malloc_header.
 
->>>>>>> 1.4385
 2005-05-10  Richard M. Stallman  <rms@gnu.org>
 
 	* xterm.c (noinclude): Add #undef.