diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2006-06-15 10:25:49 +0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2006-06-15 10:25:49 +0400 |
| commit | 59e0ff46b14aac8cf132138baa5ab7fedcaf2c2b (patch) | |
| tree | 1971dc07070ad489560ba8345586fa0d7112eb06 /ChangeLog | |
| parent | 71205cf04b3ec9a1e38f655d67bbc7baea9b0307 (diff) | |
remove conflict indicators
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -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 |