Remove a CVS conflict marker.
authorMartin Baulig <martin@src.gnome.org>
Sun, 28 Feb 1999 11:26:02 +0000 (11:26 +0000)
committerMartin Baulig <martin@src.gnome.org>
Sun, 28 Feb 1999 11:26:02 +0000 (11:26 +0000)
commit3096482697c773068ae6c8924c3e21fa4366e40b
tree802e97fe59aeaa76188d3a42718861fd34c13787
parent68726dfdfc5f145221e0e3e77e3db290dd7cfc3a
Remove a CVS conflict marker.

svn path=/trunk/; revision=666
macros/ChangeLog