HomeFreeBSD

tftpd: fix wrong conflict resolution

Description

tftpd: fix wrong conflict resolution

This is direct commit to stable/13 after wrong previous one.

Fixes: b71dde1aeba2972522a6742bbae77c2c6497eb01

Details

Provenance
eugen_grosbein.netAuthored on Aug 19 2023, 6:43 AM
Parents
rGb71dde1aeba2: tftpd: introduce new option -S
Branches
Unknown
Tags
Unknown