sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Stylefix

Browse source
This commit is contained in:
Markus Unterwaditzer 2016-09-19 22:46:07 +02:00
parent 1087afeaa8
commit 5e44f0cfe1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
vdirsyncer/cli/config.py
View file

@ -267,10 +267,10 @@ class PairConfig(object):
a_name = self.config_a['instance_name'] a_name = self.config_a['instance_name']
b_name = self.config_b['instance_name'] b_name = self.config_b['instance_name']
command = conflict_resolution[1:] command = conflict_resolution[1:]
def inner(): def inner():
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) ui_worker.put(inner)