CVS dane fvwm-web: fix warning about conflict markers

[cvs]

CVSROOT:        /home/cvs/fvwm
Module name:    fvwm-web
Changes by:     dane    14/04/08 23:10:52

Modified files:
        documentation  : dev_cvs.php 

Log message:
fix warning about conflict markers