mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-10-11 17:13:47 +02:00
Fixed conflicts in 'ChangeLog'
Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
@@ -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");
|
||||
|
Reference in New Issue
Block a user