diff options
| author | Aldy Hernandez <aldyh@gcc.gnu.org> | 2001-07-20 10:36:09 +0000 |
|---|---|---|
| committer | Aldy Hernandez <aldyh@gcc.gnu.org> | 2001-07-20 10:36:09 +0000 |
| commit | e8919ea4256496285cabe51686c76c5d6a161b03 (patch) | |
| tree | 29f8a31bad6662647ec57a78193e04089eb710a8 /gcc | |
| parent | 1f28c666af3af7109a47b20f6175838b96e8da47 (diff) | |
| download | gcc-e8919ea4256496285cabe51686c76c5d6a161b03.zip gcc-e8919ea4256496285cabe51686c76c5d6a161b03.tar.gz gcc-e8919ea4256496285cabe51686c76c5d6a161b03.tar.bz2 | |
remove conflicts
From-SVN: r44191
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index fc8edcd..51df8fe 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -125,7 +125,6 @@ previous args. (copy_object): Caller changed. ->>>>>>> 1.10722 2001-07-19 Andreas Schwab <schwab@suse.de> * configure.in (assembler dwarf2 debug_line support): Define nop |