Mercurial > irccd
changeset 1060:c4efc23a6383
irccd: fix unresolved file
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Mon, 21 Jun 2021 10:30:49 +0200 |
| parents | 9f3e01eec941 |
| children | 8aca32f4af1d |
| files | lib/irccd/conn.c |
| diffstat | 1 files changed, 1 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/irccd/conn.c Mon Jun 21 10:20:34 2021 +0200 +++ b/lib/irccd/conn.c Mon Jun 21 10:30:49 2021 +0200 @@ -415,9 +415,8 @@ { assert(conn); -<<<<<<< dest conn->statetime = time(NULL); -======= + #if !defined(IRCCD_WITH_SSL) if (conn->flags & IRC_CONN_SSL) { irc_log_warn("server %s: SSL requested but not available", conn->sv->name); @@ -426,7 +425,6 @@ return -1; } #endif ->>>>>>> source if (lookup(conn) < 0) return irc_conn_disconnect(conn), -1;