mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 23:31:02 +00:00
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:
parent
172a4e321f
commit
fef23286b2
1 changed files with 0 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue