Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kamm <mail@ckamm.de>2017-07-12 15:50:51 +0300
committerChristian Kamm <mail@ckamm.de>2017-07-13 12:48:10 +0300
commit7979342edffa97190f538061279f979dcb396717 (patch)
tree77a073d3fc678dccc6c7cc8919b013f79e3661bb /src/gui/folderstatusdelegate.h
parent2cdf5517cb992b17a1fca5e532ae2cc7cbe3db31 (diff)
AccountSettings: Draw a box to indicate pending conflicts
Diffstat (limited to 'src/gui/folderstatusdelegate.h')
-rw-r--r--src/gui/folderstatusdelegate.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/folderstatusdelegate.h b/src/gui/folderstatusdelegate.h
index a3fd5b71d..213c822dd 100644
--- a/src/gui/folderstatusdelegate.h
+++ b/src/gui/folderstatusdelegate.h
@@ -33,6 +33,7 @@ public:
HeaderRole,
FolderPathRole, // for a SubFolder it's the complete path
FolderSecondPathRole,
+ FolderConflictMsg,
FolderErrorMsg,
FolderSyncPaused,
FolderStatusIconRole,