fixing incorrect merge
fixing incorrect merge

mnutt/jsDAV,Mailden/jsDAV-original,jsilvestre/jsDAV,mnutt/jsDAV,mikedeboer/jsDAV,arcana261/jsDAV,clochix/jsDAV,WigWagCo/jsDAV,cozy/jsDAV,clochix/jsDAV,mikedeboer/jsDAV,9590/jsDAV,Mailden/jsDAV-original,9590/jsDAV,cozy/jsDAV,jsilvestre/jsDAV,WigWagCo/jsDAV,arcana261/jsDAV