X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_presence.c;fp=citadel%2Fmodules%2Fxmpp%2Fxmpp_presence.c;h=4c2d50ade321a9cdfe4ede9ef1d9de0bc5b5cb0f;hp=ebdfd152acd0663ca3141709a3228445e3c1eda2;hb=73bcf6081a14008eb1020126273f133a324bb910;hpb=d12e2c1685d3754601d4015c486f6aeb2b22795e

diff --git a/citadel/modules/xmpp/xmpp_presence.c b/citadel/modules/xmpp/xmpp_presence.c
index ebdfd152a..4c2d50ade 100644
--- a/citadel/modules/xmpp/xmpp_presence.c
+++ b/citadel/modules/xmpp/xmpp_presence.c
@@ -67,7 +67,10 @@ 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
 	cprintf("<presence from=\"%s\" ", xmlesc(xmlbuf, presence_jid, sizeof xmlbuf));
 	cprintf("to=\"%s\"></presence>", xmlesc(xmlbuf, XMPP->client_jid, sizeof xmlbuf));
 }