# Conflicts: # source/filezilla/FtpListResult.cpp Source commit: d473e13fd4143bb8e998848a19d4783d814c5985
Martin Prikryl