From 72a107fe0a444e4b1b656f598fae711294edfe55 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@gcc.gnu.org>
Date: Thu, 27 Apr 2000 00:45:13 +0000
Subject: [PATCH] Fixed ChangeLog merge snafu

From-SVN: r33453
---
 boehm-gc/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index c2aa927..fd02f6a 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 2000-04-26  Jakub Jelinek  <jakub@redhat.com>
 
 	* gcconfig.h (SPARC): Define ALIGNMENT to 8 for 64bit SPARC.
-- 
2.7.4