K 10 svn:author V 5 eugen K 8 svn:date V 27 2023-08-19T19:30:11.353502Z K 7 svn:log V 173 tftpd: cleanup after conflict resolution Fixes: a99bf9966590859d21d28ec63798820dc07e0ba8 Git Hash: c6dc07c6f1a82ab8d97446f01eb0ec4832e92f0e Git Author: eugen@FreeBSD.org END