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

@@ -179,7 +179,7 @@ impl ConnectionManager {
..Default::default()
})
.collect(),
od,
od,
));
}
ipc::FS::CancelWrite { id } => {
@@ -278,10 +278,10 @@ impl ConnectionManager {
}
}
ipc::FS::WriteOffset {
id,file_num,offset_blk
} => {
}
id,
file_num,
offset_blk,
} => {}
},
#[cfg(windows)]
Data::ClipbaordFile(_clip) => {