From 237aedc590b58c0e69d7dfcac92b5f767b7c004a Mon Sep 17 00:00:00 2001
From: Daniel Wilhelm <daniel@wili.li>
Date: Fri, 18 Apr 2014 17:17:51 +0200
Subject: 4.6

---
 file_hierarchy.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'file_hierarchy.cpp')

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());
 }
 
 
-- 
cgit