sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-03-25 08:55:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make this bit more readable

Browse source
This commit is contained in:
Hugo Osvaldo Barrera 2021-07-07 18:46:13 +02:00
parent 55c563ff8c
commit e16f83c1c2
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
contrib/conflict_resolution/resolve_interactively.py
View file

@ -48,14 +48,9 @@ def main(ical1_filename, ical2_filename):
KDIALOG,
"--warningyesnocancel",
"There was a sync conflict, do you prefer the first entry: \n"
+ get_summary(ical1)
+ "...\n(full contents: "
+ str(ical1_filename)
+ " )\n\nor the second entry: \n"
+ get_summary(ical2)
+ "...\n(full contents: "
+ str(ical2_filename)
+ " )?",
f"{get_summary(ical1)}...\n(full contents: {ical1_filename})\n\n"
"or the second entry:\n"
f"{get_summary(ical2)}...\n(full contents: {ical2_filename})?",
]
+ additional_args
)