[CM] cm.scm

Orm Finnendahl finnendahl@folkwang-hochschule.de
Fri, 7 Nov 2003 13:27:20 +0100 

Hi Rick,

there are two weird lines in current cvs of cm.scm:

line 71:

<<<<<<< cm.scm

line 87:

>>>>>>> 1.3

--
Orm