1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 51511df01..8e16d46e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -157,7 +157,6 @@ Mon Jun 13 13:01:05 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* hash.c (ruby_setenv): fixed SEGV. [ruby-dev:26186]
 
->>>>>>> 1.2673.2.1092
 Mon Jun 13 01:54:20 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* signal.c (sigexit): call rb_thread_signal_exit() instead of