From c4145a46a5110b3353c45819c1adaa04255af185 Mon Sep 17 00:00:00 2001
From: das <das>
Date: Mon, 6 Jun 2005 13:04:53 +0000
Subject: typo

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c56bcf2..d803879 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,7 @@
 
 	*** 8.4.10 TAGGED FOR RELEASE ***
 
-	* unix/tclLoadDyld.c: fixed header confilict when building this file
+	* unix/tclLoadDyld.c: fixed header conflict when building this file
 	with USE_TCL_STUBS.
 	
 	* macosx/Makefile: fixed 'embedded' target.
-- 
cgit v0.12