-<<<<<<< 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);