From de92f6b408e49cb4a0e5de1d44f6d0eafa7dce2c Mon Sep 17 00:00:00 2001
From: bothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 5 Dec 2003 20:53:30 +0000
Subject: [PATCH] Remove conflict indicator.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@74345 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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,
-- 
2.7.4