diff options
| author | Per Bothner <bothner@gcc.gnu.org> | 2003-12-05 12:53:30 -0800 |
|---|---|---|
| committer | Per Bothner <bothner@gcc.gnu.org> | 2003-12-05 12:53:30 -0800 |
| commit | 07a3c905b3608f7631f6e146b77fda01daddaea5 (patch) | |
| tree | 4c4771705149ace778c2da058a3432d3e3d9a2ff | |
| parent | 7d40b45fcb203d60c6d116d814016a0abe814825 (diff) | |
| download | gcc-07a3c905b3608f7631f6e146b77fda01daddaea5.zip gcc-07a3c905b3608f7631f6e146b77fda01daddaea5.tar.gz gcc-07a3c905b3608f7631f6e146b77fda01daddaea5.tar.bz2 | |
Remove conflict indicator.
From-SVN: r74345
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index eaaff18..1cd3f93 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -104,7 +104,6 @@ PR target/12467 * config/rs6000/altivec.md (altivec_vmsummbm): Fix typo. ->>>>>>> 2.1930 2003-12-04 Stuart Hastings <stuart@apple.com> * rs6000.c (output_call, macho_branch_islands, |