# Conflicts: # source/forms/CustomScpExplorer.h Source commit: 58ffb557eb04a78e828a854b8137e7272ad7a4a1
Martin Prikryl