fix: rebase conflict

This commit is contained in:
Kingtous
2022-05-13 14:46:37 +08:00
parent 8a6c3fe70a
commit c96c0df645
8 changed files with 92 additions and 38 deletions

View File

@@ -80,9 +80,10 @@ pub trait FileManager: Interface {
id: i32,
path: String,
to: String,
file_num: i32,
include_hidden: bool,
is_remote: bool,
) {
self.send(Data::SendFiles((id, path, to, include_hidden, is_remote)));
self.send(Data::SendFiles((id, path, to, file_num, include_hidden, is_remote)));
}
}