diff options
| author | ericm <ericm> | 2000-11-02 00:18:40 (GMT) |
|---|---|---|
| committer | ericm <ericm> | 2000-11-02 00:18:40 (GMT) |
| commit | ea6d17a2849fbb98e1462a33c03b7a4e97474c13 (patch) | |
| tree | 77fdf37b675e4976f3de0356877f6d3045449b39 | |
| parent | 2a6ed4184ce8522cc7561d05d17f32922b233323 (diff) | |
| download | tk-ea6d17a2849fbb98e1462a33c03b7a4e97474c13.zip tk-ea6d17a2849fbb98e1462a33c03b7a4e97474c13.tar.gz tk-ea6d17a2849fbb98e1462a33c03b7a4e97474c13.tar.bz2 | |
Removed bogus conflict marker.
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -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], |