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
This commit is contained in:
Fred Kiefer 2008-12-22 23:58:51 +00:00
parent 172a4e321f
commit fef23286b2

View file

@ -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