Skip to content

Commit

Permalink
Fix a merge error
Browse files Browse the repository at this point in the history
A conflict between PRs #474 and #473 resulted in a broken build.
  • Loading branch information
asomers authored and hannesdejager committed Sep 7, 2023
1 parent 35fe7cd commit 07cf0e0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion crates/unftp-sbe-fs/tests/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ async fn rmd() {
let root = std::env::temp_dir();

tokio::spawn(libunftp::Server::with_fs(root.clone()).listen(addr));
tokio::time::sleep(Duration::new(1, 0)).await;
tokio::time::sleep(std::time::Duration::new(1, 0)).await;
let mut ftp_stream = FtpStream::connect(addr).await.unwrap();
let dir_in_root = tempfile::tempdir_in(root).unwrap();
let file_name = dir_in_root.path().file_name().unwrap().to_str().unwrap();
Expand Down

0 comments on commit 07cf0e0

Please sign in to comment.