CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:        /cvs
Module name:    ports
Changes by:     z...@cvs.openbsd.org    2014/01/03 06:17:44

Modified files:
        x11/kde4/okular: Makefile 
        x11/kde4/okular/pkg: PLIST 

Log message:
correct @conflict marker.