diff options
| author | aldyh <aldyh@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-07-20 10:36:09 +0000 |
|---|---|---|
| committer | aldyh <aldyh@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-07-20 10:36:09 +0000 |
| commit | 35afd4cc6dd7932bef7a5138ebe9cc6a6c5fce01 (patch) | |
| tree | 29f8a31bad6662647ec57a78193e04089eb710a8 | |
| parent | e520693ddf82954d69e7dec095823ae60adeff6a (diff) | |
| download | ppe42-gcc-35afd4cc6dd7932bef7a5138ebe9cc6a6c5fce01.tar.gz ppe42-gcc-35afd4cc6dd7932bef7a5138ebe9cc6a6c5fce01.zip | |
remove conflicts
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@44191 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index fc8edcd342b..51df8fed28a 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 |
