summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index eaaff1803e8..1cd3f9373b6 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,
OpenPOWER on IntegriCloud