# Conflicts: # source/windows/TerminalManager.cpp # source/windows/TerminalManager.h Source commit: 771994ca6ffbc4529764fe76d830ac2ca2ae3d77
Martin Prikryl