CVS: cvs.openbsd.org: www

[Theo Buehler]

CVSROOT:        /cvs
Module name:    www
Changes by:     t...@cvs.openbsd.org    2016/03/24 23:06:01

Modified files:
        faq            : current.html 

Log message:
remove conflict markers