1 files changed, 1 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 30a5c97..447556e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -457,6 +457,7 @@
 	install-gcc.
 	* Makefile.in: Regenerate.
 
+>>>>>>> .merge-right.r70
 2006-12-04  Richard Guenther  <rguenther@suse.de>
 
 	* MAINTAINERS (Non-Algorithmic Maintainers): New section.