diff options
| author | Alan Modra <amodra@gmail.com> | 2005-06-10 00:41:30 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2005-06-10 00:41:30 +0000 |
| commit | 80f564490031cd5ffd14617ca2fa126e44922ec4 (patch) | |
| tree | 7d35511157a372a3e5713f3978bbdf722eaf803e | |
| parent | 9d12f64cdc6540b75938097d7f4ab460bb346528 (diff) | |
| download | gdb-80f564490031cd5ffd14617ca2fa126e44922ec4.zip gdb-80f564490031cd5ffd14617ca2fa126e44922ec4.tar.gz gdb-80f564490031cd5ffd14617ca2fa126e44922ec4.tar.bz2 | |
remove conflict indicator
| -rw-r--r-- | ld/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 977e4c9..de119d6 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -103,7 +103,6 @@ * emultempl/ppc64elf.em (ppc_before_allocation): Use one_lang_size_sections_pass. ->>>>>>> 1.1366 2005-06-08 Aldy Hernandez <aldyh@redhat.com> * emulparams/elf32ms1.sh: New. |