From a354af935a45c31ba19d3e1a29ee8cab3a23787c Mon Sep 17 00:00:00 2001
From: schwab <schwab@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 20 Aug 2004 11:37:13 +0000
Subject: [PATCH] Remove conflict marker.

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

diff --git a/ChangeLog b/ChangeLog
index 8c8fd1080fa9..6976be880423 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,7 +45,6 @@
 	in the recursive `make', instead of hardwiring `all'.
 	(Autogenerated TARGET-* variables): New.
 
->>>>>>> 1.967
 2004-08-13  Brian Booth  <bbooth@redhat.com>
 
 	* MAINTAINERS: Remove myself from write-after-approval.
-- 
GitLab