Fixing merge conflicts

2022-07-07 14:56:38 -07:00 · 2022-07-07 14:56:38 -07:00 · 5a1797cb21
commit 5a1797cb21
parent 59c8e8bdad 49bd51c7c1
1 changed files with 0 additions and 1 deletions
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@ -8,7 +8,6 @@ use alacritty_terminal::{
    tty::{self, setup_env},
    Term,
 };
-
 use color_translation::{get_color_at_index, to_alac_rgb};
 use dirs::home_dir;
 use futures::{