CVS: cvs.openbsd.org: ports

[Pascal Stumpf]

CVSROOT:        /cvs
Module name:    ports
Changes by:     pas...@cvs.openbsd.org  2012/06/26 16:08:01

Modified files:
        shells/osh/pkg : PLIST 

Log message:
err, fix @conflict marker