Fixed conflicts in 'ChangeLog'

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2020-08-19 16:53:24 -04:00
6 changed files with 12 additions and 5 deletions

View File

@@ -82,6 +82,7 @@ QStringList RDDownload::supportedSchemes() const
schemes.push_back("file");
schemes.push_back("ftp");
schemes.push_back("ftps");
schemes.push_back("http");
schemes.push_back("https");
schemes.push_back("sftp");