mirror of
https://github.com/weyne85/rustdesk.git
synced 2025-10-29 17:00:05 +00:00
fix: rebase conflict
This commit is contained in:
10
src/ui/cm.rs
10
src/ui/cm.rs
@@ -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) => {
|
||||
|
||||
Reference in New Issue
Block a user