Forgot to remove a conflict indicator when pasting my change log entry in...

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@15006 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2002-11-18 06:01:24 +00:00
parent 893e070f28
commit 086bd2e38d

View file

@ -19,7 +19,6 @@
Rewrote [drawHashMarksAndLabelsInRect:] to use string drawing and
bezier path code instead of direct PS operations.
>>>>>>> 1.1674
2002-11-15 Adam Fedor <fedor@gnu.org>
* Model/GMAppKit.m ([NSColor -encodeWithModelArchiver:]): Encode