[lnkForumImage]
TotalShareware - Download Free Software

Confronta i prezzi di migliaia di prodotti.
Asp Forum
 Home | Login | Register | Search 


 

Forums >

comp.lang.ruby

Merge conflict in 1.8.2 ruby cvs ChangelLog file

Ville Mattila

10/18/2004 6:40:00 AM

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

1 Answer

Hidetoshi NAGAI

10/18/2004 7:15:00 AM

0