# Conflicts: # source/forms/CustomScpExplorer.cpp # source/windows/TerminalManager.h Source commit: be2c75495e1800b50a241a5e1eabd6d9a01b5cf8
Martin Prikryl