CVS domivogt: * Removed conflict marker.

[FVWM CVS]

CVSROOT:        /home/cvs/fvwm
Module name:    fvwm
Changes by:     domivogt        06/04/06 04:57:37

Modified files:
        .              : ChangeLog 

Log message:
* Removed conflict marker.