mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-23 05:25:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix compile after rebase

Browse source
This commit is contained in:
Christian Kamm 2017-12-15 18:05:44 +01:00
parent a7c0cfc8eb
commit 83e94c3ec7
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libsync/propagatedownload.cpp
View file

@ -862,7 +862,7 @@ void PropagateDownloadFile::downloadFinished()
if (propagator()->account()->capabilities().uploadConflictFiles()) {
SyncFileItemPtr conflictItem = SyncFileItemPtr(new SyncFileItem);
conflictItem->_file = conflictFileName;
conflictItem->_type = SyncFileItem::File;
conflictItem->_type = ItemTypeFile;
conflictItem->_direction = SyncFileItem::Up;
conflictItem->_instruction = CSYNC_INSTRUCTION_NEW;
conflictItem->_modtime = conflictModTime;