Skip to content

Commit e16f83c

Browse files
author
Hugo Osvaldo Barrera
committed
Make this bit more readable
1 parent 55c563f commit e16f83c

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

contrib/conflict_resolution/resolve_interactively.py

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,9 @@ def main(ical1_filename, ical2_filename):
4848
KDIALOG,
4949
"--warningyesnocancel",
5050
"There was a sync conflict, do you prefer the first entry: \n"
51-
+ get_summary(ical1)
52-
+ "...\n(full contents: "
53-
+ str(ical1_filename)
54-
+ " )\n\nor the second entry: \n"
55-
+ get_summary(ical2)
56-
+ "...\n(full contents: "
57-
+ str(ical2_filename)
58-
+ " )?",
51+
f"{get_summary(ical1)}...\n(full contents: {ical1_filename})\n\n"
52+
"or the second entry:\n"
53+
f"{get_summary(ical2)}...\n(full contents: {ical2_filename})?",
5954
]
6055
+ additional_args
6156
)

0 commit comments

Comments
 (0)