summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4>2003-12-05 20:53:30 +0000
committerbothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4>2003-12-05 20:53:30 +0000
commitde92f6b408e49cb4a0e5de1d44f6d0eafa7dce2c (patch)
tree4c4771705149ace778c2da058a3432d3e3d9a2ff
parentfd3638dfcb5df7759c9c5d5b0da82e244acc242e (diff)
downloadppe42-gcc-de92f6b408e49cb4a0e5de1d44f6d0eafa7dce2c.tar.gz
ppe42-gcc-de92f6b408e49cb4a0e5de1d44f6d0eafa7dce2c.zip
Remove conflict indicator.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@74345 138bc75d-0d04-0410-961f-82ee72b054a4
-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