CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:        /cvs
Module name:    ports
Changes by:     z...@cvs.openbsd.org    2017/02/15 02:55:20

Modified files:
        x11/qt5/qtenginio: Makefile 
        x11/qt5/qtenginio/pkg: PLIST-docindex 

Log message:
Fix conflict marker that prevented installation of qt5-html meta-package.