Remove conflict indicator.

From-SVN: r74345

Remove conflict indicator.
From-SVN: r74345
07a3c905 · Per Bothner · 7d40b45f · 07a3c905
Commit 07a3c905 authored Dec 05, 2003 by Per Bothner
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletions

gcc/ChangeLog
+0 -1

No files found.
--- 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,