summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJason Kincl <kincljc@ornl.gov>2012-11-28 08:50:26 -0500
committerJason Kincl <kincljc@ornl.gov>2012-11-28 08:50:26 -0500
commite63eea186a953a53afbcddfae89ec49d602a1353 (patch)
treec3dd6db3990f9fd43a86f343c63ae328bfb028db /doc
parent2928afaa547dd8861f0ba9ca2c48c1579c19b48e (diff)
downloadbcfg2-e63eea186a953a53afbcddfae89ec49d602a1353.tar.gz
bcfg2-e63eea186a953a53afbcddfae89ec49d602a1353.tar.bz2
bcfg2-e63eea186a953a53afbcddfae89ec49d602a1353.zip
fixing logic so try..except works correctly, bugs
Diffstat (limited to 'doc')
-rw-r--r--doc/server/plugins/version/svn.txt2
1 files changed, 0 insertions, 2 deletions
diff --git a/doc/server/plugins/version/svn.txt b/doc/server/plugins/version/svn.txt
index 1c62a0b4e..748dce7c6 100644
--- a/doc/server/plugins/version/svn.txt
+++ b/doc/server/plugins/version/svn.txt
@@ -48,8 +48,6 @@ adding to ``/etc/bcfg2.conf``::
+=================+
| base |
+-----------------+
-| working |
-+-----------------+
| mine-conflict |
+-----------------+
| theirs-conflict |