summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAram Drevekenin <aram@poor.dev>2024-01-16 17:02:23 +0100
committerAram Drevekenin <aram@poor.dev>2024-01-16 17:02:23 +0100
commitb1a096f7af6ca058735447d2ee9e9527924c7166 (patch)
treea3725c059d1b01c1f9ccb98011df020dab0c6011
parent423cfe8d5821c0f7ff0ca4ee7c8f3623517dbb24 (diff)
style: fix merge conflict mistake
-rw-r--r--zellij-server/src/plugins/wasm_bridge.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/zellij-server/src/plugins/wasm_bridge.rs b/zellij-server/src/plugins/wasm_bridge.rs
index 9c1f426de..f4679b5e0 100644
--- a/zellij-server/src/plugins/wasm_bridge.rs
+++ b/zellij-server/src/plugins/wasm_bridge.rs
@@ -20,7 +20,6 @@ use zellij_utils::async_channel::Sender;
use zellij_utils::async_std::task::{self, JoinHandle};
use zellij_utils::consts::ZELLIJ_CACHE_DIR;
use zellij_utils::data::{PermissionStatus, PermissionType, PipeMessage, PipeSource};
-use zellij_utils::downloader::download::Download;
use zellij_utils::downloader::Downloader;
use zellij_utils::input::permission::PermissionCache;
use zellij_utils::notify_debouncer_full::{notify::RecommendedWatcher, Debouncer, FileIdMap};