git: c6dc07c6f1a8 - stable/12 - tftpd: cleanup after conflict resolution
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 19 Aug 2023 19:29:50 UTC
The branch stable/12 has been updated by eugen:
URL: https://cgit.FreeBSD.org/src/commit/?id=c6dc07c6f1a82ab8d97446f01eb0ec4832e92f0e
commit c6dc07c6f1a82ab8d97446f01eb0ec4832e92f0e
Author: Eugene Grosbein <eugen@FreeBSD.org>
AuthorDate: 2023-08-19 19:28:49 +0000
Commit: Eugene Grosbein <eugen@FreeBSD.org>
CommitDate: 2023-08-19 19:28:49 +0000
tftpd: cleanup after conflict resolution
Fixes: a99bf9966590859d21d28ec63798820dc07e0ba8
---
libexec/tftpd/tftpd.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c
index 56b97d4791bc..ed030b23da30 100644
--- a/libexec/tftpd/tftpd.c
+++ b/libexec/tftpd/tftpd.c
@@ -140,7 +140,6 @@ main(int argc, char *argv[])
tftp_openlog("tftpd", LOG_PID | LOG_NDELAY, LOG_FTP);
while ((ch = getopt(argc, argv, "cCd:F:lnoOp:s:Su:U:wW")) != -1) {
->>>>>>> 273a307d0b80 (tftpd: introduce new option -S)
switch (ch) {
case 'c':
ipchroot = 1;