From fef23286b244b7d9316b2094f1537d19dfb844cc Mon Sep 17 00:00:00 2001
From: Fred Kiefer <fredkiefer@gmx.de>
Date: Mon, 22 Dec 2008 23:58:51 +0000
Subject: [PATCH] Removed left over SVN conflict in ChangeLog.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@27408 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index fa3638458..9e955c1d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,7 +53,6 @@
 	* GNUmakefile: Export GNUSTEP_CORE_SOFTWARE to reduce chances of a
 	problem if a GNUmakefile in a subdirectory is missing it.
 
->>>>>>> .r27362
 2008-12-17 21:20-EST Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* Source/GSNibLoading.m: Remove change which resets the bounds