From d53fc32e2a377d4dd5cd2ec0a34c1a5d790ac660 Mon Sep 17 00:00:00 2001
From: bonzini <bonzini>
Date: Thu, 15 Jun 2006 06:25:49 +0000
Subject: [PATCH] remove conflict indicators

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

diff --git a/ChangeLog b/ChangeLog
index 661380ac4d..bf92c59d3d 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
-- 
2.11.0