diff options
| author | Ian Lance Taylor <ian@airs.com> | 1998-06-24 23:09:05 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 1998-06-24 23:09:05 +0000 |
| commit | 9154d6889d01f3cc0f44ccf92c543cbdbc242c35 (patch) | |
| tree | a5da99bcaab58735164672812d235013fa248bb5 /gas | |
| parent | 35111bf8a7a2294ad0fd84699ed83fe1188dba8a (diff) | |
| download | gdb-9154d6889d01f3cc0f44ccf92c543cbdbc242c35.zip gdb-9154d6889d01f3cc0f44ccf92c543cbdbc242c35.tar.gz gdb-9154d6889d01f3cc0f44ccf92c543cbdbc242c35.tar.bz2 | |
remove CVS conflict marker
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 4e314c4..5648ee0 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -42,7 +42,6 @@ end-sanitize-v850e * config/obj-coff.c (c_symbol_merge): Replace complex expresion with call to macro SYM_AUXINFO. ->>>>>>> 1.2596 Tue Jun 23 15:09:27 1998 Mike Stump <mrs@wrs.com> * Makefile.am (install-exec-local): Don't let EXEEXT interfere |