From: Per Bothner <bothner@gcc.gnu.org>
Date: Fri, 5 Dec 2003 20:53:30 +0000 (-0800)
Subject: Remove conflict indicator.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=07a3c905b3608f7631f6e146b77fda01daddaea5;p=gcc.git

Remove conflict indicator.

From-SVN: r74345
---

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,