Conflict handling: add the OC-ConflictBasePath header
authorOlivier Goffart <ogoffart@woboq.com>
Tue, 14 Aug 2018 11:35:04 +0000 (13:35 +0200)
committerKevin Ottens <kevin.ottens@nextcloud.com>
Tue, 15 Dec 2020 09:58:04 +0000 (10:58 +0100)
commitc3f745fa766055a69f8a3254fadd85334ce2b70e
tree40c4a714c1ab60d6224b74667e975bf6c2fd705b
parent358aadfb983167456c9056d81c7ccc7593357220
Conflict handling: add the OC-ConflictBasePath header

Issue #6702
src/common/syncjournaldb.cpp
src/common/syncjournalfilerecord.h
src/libsync/owncloudpropagator.cpp
src/libsync/propagatedownload.cpp
src/libsync/propagateupload.cpp
src/libsync/syncengine.cpp
test/testsyncconflict.cpp