diff options
| author | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-21 12:33:15 +0000 |
|---|---|---|
| committer | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-21 12:33:15 +0000 |
| commit | 90b1ac0f5622d0d9dd2fc91d6864fd1bc148f343 (patch) | |
| tree | 42e7bd151a8739c469220a348021dd39f673097c | |
| parent | 7bcf25aaa9b79e64923f22c39b653f65e7d6b907 (diff) | |
| download | ppe42-gcc-90b1ac0f5622d0d9dd2fc91d6864fd1bc148f343.tar.gz ppe42-gcc-90b1ac0f5622d0d9dd2fc91d6864fd1bc148f343.zip | |
remove conflict indicators
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96790 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 2e947eaed20..e16a3125bee 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -495,7 +495,6 @@ (arc_rodata_string, TARGET_OPTIONS): Delete. * config/arc/arc.opt: New file. ->>>>>>> 2.7930 2005-03-17 Richard Henderson <rth@redhat.com> * doc/extend.texi (Weak Pragmas): New section. |
