Fix merge error
Fix merge error

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