From fb9557de050f4a88b57796574a3e8e93d37496de Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Wed, 2 Nov 2011 22:40:51 -0400 Subject: [PATCH] Small fix to above --- webcit/dav_main.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) 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); -- 2.30.2