From 299a9dd19c32dafe1765eb01edd46ffeb93d57f4 Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <bonzini@gnu.org>
Date: Thu, 15 Jun 2006 06:25:49 +0000
Subject: remove conflict indicators

---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 661380a..bf92c59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -83,7 +83,6 @@
 	* config-ml.in: Alter CCASFLAGS to include special
 	multilib options the same as is done for CFLAGS.
 
->>>>>>> 1.659
 2006-05-31  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* Makefile.def: Added dependencies from sim and gdb on intl, and
-- 
cgit v1.1