# HG changeset patch
# User David Demelier <markand@malikania.fr>
# Date 1624264249 -7200
# Node ID c4efc23a63835576f05ced4aa22402ade1cfa0fb
# Parent  9f3e01eec9412541cfff3aa4dbb04544f9a13d5c
irccd: fix unresolved file

diff -r 9f3e01eec941 -r c4efc23a6383 lib/irccd/conn.c
--- 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;