From: Ville Mattila <mulperi@...>
Date: 2004-10-18T15:44:23+09:00
Subject: Merge conflict in 1.8.2 ruby cvs ChangelLog file

There is a conflict tag:
>>>>>>> 1.2673.2.531
Fri Oct 15 18:04:35 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>

        * ext/tk/lib/tk/timer.rb: TkTimer.new(interval, loop){ ... } is
          acceptable. Add TkTimer.start ( == new + start ).

In the current CVS 1.8.2 version of ChangeLog

 - Ville