From: Paolo Bonzini <bonzini@gnu.org>
Date: Thu, 15 Jun 2006 06:25:49 +0000 (+0000)
Subject: remove conflict indicators
X-Git-Tag: newlib-csl-sourcerygxx-3_4_4-25~282
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=299a9dd19c32dafe1765eb01edd46ffeb93d57f4;p=thirdparty%2Fbinutils-gdb.git

remove conflict indicators
---

diff --git a/ChangeLog b/ChangeLog
index 661380ac4dc..bf92c59d3d6 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