From ea6d17a2849fbb98e1462a33c03b7a4e97474c13 Mon Sep 17 00:00:00 2001
From: ericm <ericm>
Date: Thu, 2 Nov 2000 00:18:40 +0000
Subject: Removed bogus conflict marker.

---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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],
-- 
cgit v0.12