diff --git a/contrib/conflict_resolution/resolve_interactively.py b/contrib/conflict_resolution/resolve_interactively.py index bd5b645..6da9ab7 100755 --- a/contrib/conflict_resolution/resolve_interactively.py +++ b/contrib/conflict_resolution/resolve_interactively.py @@ -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 )