summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorericm <ericm>2000-11-02 00:18:40 (GMT)
committerericm <ericm>2000-11-02 00:18:40 (GMT)
commitea6d17a2849fbb98e1462a33c03b7a4e97474c13 (patch)
tree77fdf37b675e4976f3de0356877f6d3045449b39
parent2a6ed4184ce8522cc7561d05d17f32922b233323 (diff)
downloadtk-ea6d17a2849fbb98e1462a33c03b7a4e97474c13.zip
tk-ea6d17a2849fbb98e1462a33c03b7a4e97474c13.tar.gz
tk-ea6d17a2849fbb98e1462a33c03b7a4e97474c13.tar.bz2
Removed bogus conflict marker.
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ed08bd3..9daeb85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,7 +32,6 @@
* win/Makefile.in (test, winhelp, tktest): corrected the
TCL_LIBRARY path specification.
->>>>>>> 1.236
2000-10-18 Eric Melski <ericm@ajubasolutions.com>
* win/tkWinDraw.c (RenderObject): Applied patch from [Bug: 6368],