From eb30a375348f31f7c8f74bdd9dedff4390b79014 Mon Sep 17 00:00:00 2001
From: Mark Mitchell <mmitchel@gcc.gnu.org>
Date: Tue, 23 Mar 1999 08:38:04 +0000
Subject: [PATCH] Remove conflict marker.

From-SVN: r25923
---
 gcc/cp/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3b9dd255c9f..e189f6db7b2 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -65,7 +65,6 @@
 	* decl.c (start_function): Suppress normal linkage heuristics
 	for #pragma interface under MULTIPLE_SYMBOL_SPACES.
 
->>>>>>> 1.947
 1999-03-19  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
 	* Make-lang.in: ($(INTL_TARGETS)): depend on cp/parse.c
-- 
2.30.2