CVSROOT: /cvs Module name: ports Changes by: [email protected] 2015/08/11 14:15:41
Modified files:
devel/go-tools : Makefile
devel/go-tools/pkg: PLIST
sysutils/stress: Makefile
sysutils/stress/pkg: PLIST
Log message:
add missing conflict markers due to 'bin/stress'
