diff options
| author | Zack Weinberg <zack@gcc.gnu.org> | 2001-10-20 18:16:32 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2001-10-20 18:16:32 +0000 |
| commit | d7aa3e1e9a201d2cb8e90874f9c3d8d6976a850b (patch) | |
| tree | 2d4accaf594636d6c3e8abc270a8c5c61bb8fa3c | |
| parent | a4017847d5d2eb467c29f229b0507f5089f0138b (diff) | |
| download | gcc-d7aa3e1e9a201d2cb8e90874f9c3d8d6976a850b.zip gcc-d7aa3e1e9a201d2cb8e90874f9c3d8d6976a850b.tar.gz gcc-d7aa3e1e9a201d2cb8e90874f9c3d8d6976a850b.tar.bz2 | |
Remove stray conflict marker
From-SVN: r46386
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f0fe8e7..e8cfc22 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -90,7 +90,6 @@ Sat Oct 20 12:01:07 CEST 2001 Jan Hubicka <jh@suse.cz> call run_directive directly. (_cpp_do__Pragma): Simplify. ->>>>>>> 1.11604 2001-10-19 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> * pe.c (arm_pe_unique_section): Const-ify. |