diff options
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Svn.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Svn.py b/src/lib/Bcfg2/Server/Plugins/Svn.py index d444b6a0c..9ec334dd0 100644 --- a/src/lib/Bcfg2/Server/Plugins/Svn.py +++ b/src/lib/Bcfg2/Server/Plugins/Svn.py @@ -38,7 +38,7 @@ class Svn(Bcfg2.Server.Plugin.Version): """PySvn callback function to resolve conflicts""" self.logger.info("Svn: Resolving conflict for %s with %s" % \ (conflict_description['path'], - self.svn_resolution) + self.svn_resolution)) return self.conflict_resolution_map[self.svn_resolution], None, False def __init__(self, core, datastore): |