This commit is contained in:
andrew (from workstation) 2020-05-19 22:19:57 +02:00
parent 46b692c2e3
commit 005675e140

View File

@ -1370,7 +1370,7 @@ void FileManager::do_cancel_generate(FileNodePtr node) {
}
Result<FileId> FileManager::merge(FileId x_file_id, FileId y_file_id, bool no_sync) {
return x_file_id;
return y_file_id;
}
void FileManager::add_file_source(FileId file_id, FileSourceId file_source_id) {