CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:        /cvs
Module name:    ports
Changes by:     st...@cvs.openbsd.org   2018/06/28 10:24:48

Modified files:
        lang/php/7.0   : Makefile 
        lang/php/7.0/pkg: PLIST-gd 

Log message:
fix -gd @conflict marker