# Conflicts: # source/forms/CustomScpExplorer.cpp Source commit: 44c34303d5d45d92cee553dc090f52a2c1338441
Martin Prikryl