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