chuck 2002/04/03 08:24:44 PST
Modified files:
docs CHANGES
Log:
fix conflict
Revision Changes Path
1.469 +2 -0 imp/docs/CHANGES
Chora Links:
http://cvs.horde.org/diff.php/imp/docs/CHANGES?r1=1.468&r2=1.469&ty=u