diff options
Diffstat (limited to 'file_hierarchy.cpp')
| -rw-r--r-- | file_hierarchy.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/file_hierarchy.cpp b/file_hierarchy.cpp index 5bd7c5bb..987713cb 100644 --- a/file_hierarchy.cpp +++ b/file_hierarchy.cpp @@ -119,7 +119,7 @@ bool hasDirectChild(const HierarchyObject& hierObj, Predicate p) SyncOperation FileSystemObject::testSyncOperation(SyncDirection testSyncDir, bool active) const { - return proposedSyncOperation(getCategory(), active, testSyncDir, syncDirConflict); + return proposedSyncOperation(getCategory(), active, testSyncDir, getSyncOpConflict()); } |