fix some conflicts that for some reason weren't resolved during the last cherry-picks

[citadel.git] / webcit / tcp_sockets.c

diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c
index 94b5ff7c45251b1cd713ded68e05c839fd80ab6a..b27f2ad864c1c5cd9da9f235e5b6e19de8ab95ec 100644 (file)
--- a/webcit/tcp_sockets.c
+++ b/webcit/tcp_sockets.c
@@ -569,15 +569,12 @@ retry:
 
        s = socket( ((ip_version == 6) ? PF_INET6 : PF_INET), SOCK_STREAM, (p->p_proto));
        if (s < 0) {
-<<<<<<< HEAD
                if (IsDefault && (errno == EAFNOSUPPORT))
                {
                        s = 0;
                        ip_addr = ipv4broadcast;
                        goto retry;
                }
-=======
->>>>>>> 156d3ea... SYSLOG: more places to correct the loglevel parameters.
                syslog(LOG_WARNING, "Can't create a listening socket: %s\n", strerror(errno));
                return (-WC_EXIT_BIND);
        }