diff options
Diffstat (limited to 'src/dolphinmodel.h')
| -rw-r--r-- | src/dolphinmodel.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dolphinmodel.h b/src/dolphinmodel.h index b03507dc5..717f21d4e 100644 --- a/src/dolphinmodel.h +++ b/src/dolphinmodel.h @@ -39,7 +39,8 @@ public: enum RevisionState { LocalRevision, - LatestRevision + LatestRevision, + ConflictingRevision // TODO... }; |