]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
projects / FreeBSD / FreeBSD.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b71dde1) | patch
tftpd: fix wrong conflict resolution
authorEugene Grosbein <eugen@FreeBSD.org>
Sat, 19 Aug 2023 06:43:08 +0000 (13:43 +0700)
committerEugene Grosbein <eugen@FreeBSD.org>
Sat, 19 Aug 2023 06:43:08 +0000 (13:43 +0700)
commit9397112d89df25a9e1ab8d84e8fc88fe789e1324
treee0b9873bfa4a27858397ad40b35da27652fbb3eetree | snapshot
parentb71dde1aeba2972522a6742bbae77c2c6497eb01commit | diff
tftpd: fix wrong conflict resolution

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

Fixes: b71dde1aeba2972522a6742bbae77c2c6497eb01
libexec/tftpd/tftpd.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.