Skip to content
Unverified Commit 6b3975c2 authored by Morris Jobke's avatar Morris Jobke Committed by GitHub
Browse files

Merge pull request #6846 from nextcloud/filelist-confict-path 

still trigger conflict resolution for existing entries when the curre…
parents 2bfa1ce5 8eaf1956
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment