Fix missing return value

This commit is contained in:
Markus Unterwaditzer 2016-09-20 09:59:24 +02:00
parent fbaac88776
commit 78e11ebb66

View file

@ -272,7 +272,7 @@ class PairConfig(object):
return resolve_conflict_via_command(a, b, command, a_name,
b_name)
ui_worker = get_ui_worker()
ui_worker.put(inner)
return ui_worker.put(inner)
self.conflict_resolution = resolve
else: