CVSROOT:        /cvs
Module name:    ports
Changes by:     [email protected]    2015/02/04 19:04:00

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

Log message:
Repair conflict between -main and -docs, introduced in previous.

The intended diff had this conflict resolved, but I ended up committing
the previous diff...  Problem spotted by Markus Lude.

Reply via email to