svn commit: r465493 - head/net

[Alexey Dokuchaev]

On Sun, Mar 25, 2018 at 01:02:51AM +0000, Timur I. Bakeyev wrote:
> New Revision: 465493
> URL: https://svnweb.freebsd.org/changeset/ports/465493
> 
> Log:
>   Hook up samba48. Repocopy policy... has issues.

There are no issues with repocopy policy and/or procedure.  You should have
repocopied, made necessary changes, then commit.  Instead, you've committed
verbatim copy, which naturally and unsurprisingly had resulted in conflict.

./danfe