Subject: CVS domivogt: * removed conflict marker

From: CVS <[email-masked]>
Date: Tue, 18 May 1999 19:34:11 -0500 (CDT)

CVSROOT:	/home/cvs/fvwm
Module name:	fvwm
Changes by:	domivogt	99/05/18 19:34:10

Modified files:
	.              : ChangeLog 

Log message:
* removed conflict marker

--
Visit the official FVWM web page at <URL:http://www.fvwm.org/>.
To unsubscribe from the list, send "unsubscribe fvwm-workers" in the
body of a message to [email-masked].
To report problems, send mail to [email-masked]