From: Hidetoshi NAGAI <nagai@...>
Date: 2004-10-18T16:15:06+09:00
Subject: Re: Merge conflict in 1.8.2 ruby cvs ChangelLog file

From: Ville Mattila <mulperi@cc.hut.fi>
Subject: Merge conflict in 1.8.2 ruby cvs ChangelLog file
Date: Mon, 18 Oct 2004 15:44:23 +0900
Message-ID: <k6to34ts.fsf@cc.hut.fi>
> There is a conflict tag:

Sorry. I've remove it.
-- 
                                  Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)