Remove merge conflict leftovers
This is a direct commit to stable/13.
Reported by: Stefan Grundmann via https://github.com/freebsd/freebsd-src/pull/639
Remove merge conflict leftovers Tags None Referenced Files None Subscribers None
Description
Details
|