merge

[citadel.git] / citadel / modules / xmpp / xmpp_presence.c

diff --git a/citadel/modules/xmpp/xmpp_presence.c b/citadel/modules/xmpp/xmpp_presence.c
index 4c2d50ade321a9cdfe4ede9ef1d9de0bc5b5cb0f..3a06c68f79979ca2c148869c5f2a89bf85b0eb21 100644 (file)
--- a/citadel/modules/xmpp/xmpp_presence.c
+++ b/citadel/modules/xmpp/xmpp_presence.c
@@ -67,10 +67,7 @@ void xmpp_indicate_presence(char *presence_jid)
 {
        char xmlbuf[256];
 
-<<<<<<< HEAD
-       syslog(LOG_DEBUG, "XMPP: indicating presence of <%s> to <%s>", presence_jid, XMPP->client_jid);
-=======
->>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498
+       XMPP_syslog(LOG_DEBUG, "XMPP: indicating presence of <%s> to <%s>", presence_jid, XMPP->client_jid);
        cprintf("<presence from=\"%s\" ", xmlesc(xmlbuf, presence_jid, sizeof xmlbuf));
        cprintf("to=\"%s\"></presence>", xmlesc(xmlbuf, XMPP->client_jid, sizeof xmlbuf));
 }