Merge conflict in 1.8.2 ruby cvs ChangelLog file

[Ville Mattila]

There is a conflict tag:Fri Oct 15 18:04:35 2004 Hidetoshi NAGAI <[email protected]>

* 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

 

[Hidetoshi NAGAI]

From: Ville Mattila <[email protected]>
Subject: Merge conflict in 1.8.2 ruby cvs ChangelLog file
Date: Mon, 18 Oct 2004 15:44:23 +0900

There is a conflict tag:

Sorry. I've remove it.