Erase old CVS conflict line.
authorMartin Soto <martinsoto@users.sourceforge.net>
Thu, 24 Nov 2005 13:58:55 +0000 (13:58 +0000)
committerMartin Soto <martinsoto@users.sourceforge.net>
Thu, 24 Nov 2005 13:58:55 +0000 (13:58 +0000)
commit491c9ab3e01ff3aa8136cb10a953a308e48cf7cd
tree2d4c791f78b59768b0a279af263b934ba9b6747e
parentf51be26aa8f3d1388a05dea850a40508c6fb8507
Erase old CVS conflict line.

Original commit message from CVS:
Erase old CVS conflict line.
ChangeLog