diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2012-12-05 07:11:48 -0600 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2012-12-05 07:11:48 -0600 |
| commit | 67b8718ac3cc2e606b318cfd8c74301a15bd58c1 (patch) | |
| tree | b2fc31e7672250e0995eda38ed804a5ad5f486df | |
| parent | 4dcd236efc95718475615da9d054e3e3ed7f128c (diff) | |
| download | bcfg2-67b8718ac3cc2e606b318cfd8c74301a15bd58c1.tar.gz bcfg2-67b8718ac3cc2e606b318cfd8c74301a15bd58c1.tar.bz2 bcfg2-67b8718ac3cc2e606b318cfd8c74301a15bd58c1.zip | |
doc: Fix typo
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| -rw-r--r-- | doc/server/plugins/version/svn.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/server/plugins/version/svn.txt b/doc/server/plugins/version/svn.txt index d0c5c2317..206b193c3 100644 --- a/doc/server/plugins/version/svn.txt +++ b/doc/server/plugins/version/svn.txt @@ -49,7 +49,7 @@ The possible values of ``conflict_resolution`` are: * ``postpone`` (default) * ``mine-conflict`` * ``theirs-conflict`` -* ``mine-full` +* ``mine-full`` * ``theirs-full`` The other possible SVN conflict resolvers (``edit``, ``launch``, |