From 67b8718ac3cc2e606b318cfd8c74301a15bd58c1 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Wed, 5 Dec 2012 07:11:48 -0600 Subject: doc: Fix typo Signed-off-by: Sol Jerome --- doc/server/plugins/version/svn.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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``, -- cgit v1.2.3-1-g7c22