X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_query_namespace.c;h=805b5101eaf09506ac8b4d488b85329fc5748771;hb=313ec8cd15d8b4b0490862ef294f3aaa6390172c;hp=fb3374e9e73984a91d1584ab90007171305cd0ad;hpb=73bcf6081a14008eb1020126273f133a324bb910;p=citadel.git

diff --git a/citadel/modules/xmpp/xmpp_query_namespace.c b/citadel/modules/xmpp/xmpp_query_namespace.c
index fb3374e9e..805b5101e 100644
--- a/citadel/modules/xmpp/xmpp_query_namespace.c
+++ b/citadel/modules/xmpp/xmpp_query_namespace.c
@@ -98,10 +98,6 @@ void xmpp_iq_roster_query(void)
  * Client is doing a namespace query.  These are all handled differently.
  * A "rumplestiltskin lookup" is the most efficient way to handle this.  Please do not refactor this code.
  */
-<<<<<<< HEAD
-=======
-
->>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498
 void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_xmlns)
 {
 	int supported_namespace = 0;
@@ -121,11 +117,7 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
 		supported_namespace = 1;
 	}
 
-<<<<<<< HEAD
-	syslog(LOG_DEBUG, "xmpp_query_namespace(id=%s, from=%s, to=%s, xmlns=%s)\n", iq_id, iq_from, iq_to, query_xmlns);
-=======
-	XMPP_syslog(LOG_DEBUG, "xmpp_query_namespace(%s, %s, %s, %s)\n", iq_id, iq_from, iq_to, query_xmlns);
->>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498
+	XMPP_syslog(LOG_DEBUG, "xmpp_query_namespace(id=%s, from=%s, to=%s, xmlns=%s)\n", iq_id, iq_from, iq_to, query_xmlns);
 
 	/*
 	 * Beginning of query result.
@@ -135,17 +127,10 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
 	}
 	else {
 		cprintf("<iq type=\"error\" ");
-<<<<<<< HEAD
-	}
-	if (!IsEmptyStr(iq_from)) {
-		cprintf("to=\"%s\" ", xmlesc(xmlbuf, iq_from, sizeof xmlbuf));
-	}
-=======
 	}
 	if (!IsEmptyStr(iq_from)) {
 		cprintf("to=\"%s\" ", xmlesc(xmlbuf, iq_from, sizeof xmlbuf));
 	}
->>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498
 	cprintf("id=\"%s\">", xmlesc(xmlbuf, iq_id, sizeof xmlbuf));
 
 	/*
@@ -180,14 +165,7 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
 	 */
 
 	else {
-<<<<<<< HEAD
-		syslog(LOG_DEBUG, "Unknown query namespace '%s' - returning <service-unavailable/>\n", query_xmlns);
-=======
-		XMPP_syslog(LOG_DEBUG,
-			    "Unknown query namespace '%s' - returning <service-unavailable/>\n",
-			    query_xmlns
-		);
->>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498
+		XMPP_syslog(LOG_DEBUG, "Unknown query namespace '%s' - returning <service-unavailable/>\n", query_xmlns);
 		cprintf("<error code=\"503\" type=\"cancel\">"
 			"<service-unavailable xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
 			"</error>"