CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:        /cvs
Module name:    ports
Changes by:     ajacou...@cvs.openbsd.org       2011/04/07 11:48:22

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

Log message:
Tweak conflict marker.