summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorJason Kincl <kincljc@ornl.gov>2012-11-27 21:24:31 -0500
committerJason Kincl <kincljc@ornl.gov>2012-11-27 21:24:31 -0500
commiteefa08eaac8e45963321bd55291a81a579db2cb1 (patch)
treecd8fb186491c697a149ab5eaf0341ab1e25bb47a /src/lib
parent93bd9dd8354264b7a96b5061cf51588b687ba24e (diff)
downloadbcfg2-eefa08eaac8e45963321bd55291a81a579db2cb1.tar.gz
bcfg2-eefa08eaac8e45963321bd55291a81a579db2cb1.tar.bz2
bcfg2-eefa08eaac8e45963321bd55291a81a579db2cb1.zip
fixing line lengths
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Svn.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Svn.py b/src/lib/Bcfg2/Server/Plugins/Svn.py
index 9fe3fd398..a3a149b1f 100644
--- a/src/lib/Bcfg2/Server/Plugins/Svn.py
+++ b/src/lib/Bcfg2/Server/Plugins/Svn.py
@@ -50,7 +50,8 @@ class Svn(Bcfg2.Server.Plugin.Version):
else:
self.client = pysvn.Client()
try:
- if self.core.setup.cfg.has_option("svn", "conflict_resolution"):
+ if self.core.setup.cfg.has_option("svn",
+ "conflict_resolution"):
self.svn_resolution = self.core.setup.cfp.get("svn",
"conflict_resolution")
self.client.callback_conflict_resolver = \