From 07ca0cbb11bbc0491e134c863cd8a6133c2a9cf1 Mon Sep 17 00:00:00 2001
From: Kunal Mohan <kunalmohan99@gmail.com>
Date: Wed, 12 May 2021 23:57:22 +0530
Subject: [PATCH] Fix after rebase

---
 src/server/mod.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/server/mod.rs b/src/server/mod.rs
index b925b4d2..4c6fb757 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -15,9 +15,8 @@ use crate::common::{
     os_input_output::ServerOsApi,
     pty::{pty_thread_main, Pty, PtyInstruction},
     screen::{screen_thread_main, ScreenInstruction},
-    setup::install::populate_data_dir,
+    setup::{get_default_data_dir, install::populate_data_dir},
     thread_bus::{ChannelWithContext, SenderType, SenderWithContext, SyncChannelWithContext},
-    utils::consts::ZELLIJ_PROJ_DIR,
     wasm_vm::{wasm_thread_main, PluginInstruction},
 };
 use crate::layout::Layout;