diff options
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Svn.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Svn.py | 3 |
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 = \ |