CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:        /cvs
Module name:    ports
Changes by:     j...@cvs.openbsd.org    2019/04/12 12:21:17

Modified files:
        net/samba      : Makefile 
        net/samba/pkg  : PLIST-main 

Log message:
Fix @conflict marker

ok naddy@