diff options
| author | Christian Kamm <mail@ckamm.de> | 2018-08-21 12:24:45 +0300 |
|---|---|---|
| committer | ckamm <mail@ckamm.de> | 2018-08-22 10:03:54 +0300 |
| commit | b4f63ca2192cfdc77971f39b315f926bab68a8ae (patch) | |
| tree | 3207050acf735f35eb964a288c4a9acf0eaa42f2 /src/libsync/propagateupload.cpp | |
| parent | f50afaf3eb420ef67fa6c51debe21e9adccdc285 (diff) | |
Conflicts: Rename BasePath to InitialBasePath #6709
Diffstat (limited to 'src/libsync/propagateupload.cpp')
| -rw-r--r-- | src/libsync/propagateupload.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsync/propagateupload.cpp b/src/libsync/propagateupload.cpp index 95f6a1e4a..c2d5c387d 100644 --- a/src/libsync/propagateupload.cpp +++ b/src/libsync/propagateupload.cpp @@ -599,8 +599,8 @@ QMap<QByteArray, QByteArray> PropagateUploadFileCommon::headers() auto conflictRecord = propagator()->_journal->conflictRecord(_item->_file.toUtf8()); if (conflictRecord.isValid()) { headers["OC-Conflict"] = "1"; - if (!conflictRecord.basePath.isEmpty()) - headers["OC-ConflictBasePath"] = conflictRecord.basePath; + if (!conflictRecord.initialBasePath.isEmpty()) + headers["OC-ConflictInitialBasePath"] = conflictRecord.initialBasePath; if (!conflictRecord.baseFileId.isEmpty()) headers["OC-ConflictBaseFileId"] = conflictRecord.baseFileId; if (conflictRecord.baseModtime != -1) |