Subject: CVS domivogt: * Removed conflict markers.

From: CVS <[email-masked]>
Date: Thu, 30 Sep 1999 07:29:48 -0500 (CDT)

CVSROOT:	/home/cvs/fvwm
Module name:	fvwm
Changes by:	domivogt	99/09/30 07:29:47

Modified files:
	.              : ChangeLog 
	modules        : ChangeLog 

Log message:
* Removed conflict markers.

--
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]