diff --git a/gitbutler-app/src/project_repository/conflicts.rs b/gitbutler-app/src/project_repository/conflicts.rs index 0bf924d46..88fe96b9e 100644 --- a/gitbutler-app/src/project_repository/conflicts.rs +++ b/gitbutler-app/src/project_repository/conflicts.rs @@ -6,7 +6,7 @@ // the merge parent file is removed when the merge is complete use std::{ - io::{BufRead, IoSlice, Write}, + io::{BufRead, Write}, path::{Path, PathBuf}, };