CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:        /cvs
Module name:    ports
Changes by:     jas...@cvs.openbsd.org  2011/09/26 09:17:25

Modified files:
        devel/vte3     : Makefile 
        devel/vte3/pkg : PLIST 

Log message:
fix the other conflict marker too..