From ab83efebe3843725f570bc432a4f18ca2da027f6 Mon Sep 17 00:00:00 2001 From: Ivan Enderlin Date: Tue, 17 Aug 2021 14:15:51 +0200 Subject: [PATCH] Fix merge conflict. --- lib/vfs/src/host_fs.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/vfs/src/host_fs.rs b/lib/vfs/src/host_fs.rs index eb23177d1f0..62d7ce871fc 100644 --- a/lib/vfs/src/host_fs.rs +++ b/lib/vfs/src/host_fs.rs @@ -4,7 +4,6 @@ use serde::{de, Deserialize, Serialize}; use std::convert::TryInto; use std::fs; use std::io::{self, Read, Seek, Write}; -use std::io::{Read, Seek, Write}; #[cfg(unix)] use std::os::unix::io::{AsRawFd, RawFd}; #[cfg(windows)]