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