X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit%2Fdav_main.c;h=97fcc9dc11f7423fbedeae9ebae9db5de8949a72;hp=d86c81034d1f76be662a01bcae98f1d2f4bf6756;hb=fb9557de050f4a88b57796574a3e8e93d37496de;hpb=43c1b0f34ec4eeeefe052ec4caaea44f1b5e9f82

diff --git a/webcit/dav_main.c b/webcit/dav_main.c
index d86c81034..97fcc9dc1 100644
--- a/webcit/dav_main.c
+++ b/webcit/dav_main.c
@@ -194,7 +194,7 @@ void groupdav_identify_host(void) {
 }
 
 
-void tmplput_dav.hOSTNAME(StrBuf *Target, WCTemplputParams *TP) 
+void tmplput_dav_HOSTNAME(StrBuf *Target, WCTemplputParams *TP) 
 {
 	StrBufAppendPrintf(Target, "%s", ChrPtr(site_prefix));
 }
@@ -335,11 +335,7 @@ InitModule_GROUPDAV
 			     groupdav_main, GroupdavDispatchREST, 
 			     XHTTP_COMMANDS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE);
 
-<<<<<<< HEAD:webcit/dav_main.c
-	RegisterNamespace("DAV:HOSTNAME", 0, 0, tmplput_groupdav_HOSTNAME, NULL, CTX_NONE);
-=======
-	RegisterNamespace("DAV:HOSTNAME", 0, 0, tmplput_dav.hOSTNAME, NULL, CTX_NONE);
->>>>>>> c380e59... Renamed 'groupdav' to 'dav' in filenames:webcit/dav_main.c
+	RegisterNamespace("DAV:HOSTNAME", 0, 0, tmplput_davHOSTNAME, NULL, CTX_NONE);
 
 	RegisterConditional(HKEY("COND:DAV:NS"), 0, Conditional_DAV_NS,  CTX_NONE);