mirror of
https://github.com/samsonjs/vdirsyncer.git
synced 2026-04-27 14:57:41 +00:00
Fix missing return value
This commit is contained in:
parent
fbaac88776
commit
78e11ebb66
1 changed files with 1 additions and 1 deletions
|
|
@ -272,7 +272,7 @@ class PairConfig(object):
|
||||||
return resolve_conflict_via_command(a, b, command, a_name,
|
return resolve_conflict_via_command(a, b, command, a_name,
|
||||||
b_name)
|
b_name)
|
||||||
ui_worker = get_ui_worker()
|
ui_worker = get_ui_worker()
|
||||||
ui_worker.put(inner)
|
return ui_worker.put(inner)
|
||||||
|
|
||||||
self.conflict_resolution = resolve
|
self.conflict_resolution = resolve
|
||||||
else:
|
else:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue