mirror of
https://github.com/zed-industries/zed.git
synced 2024-12-28 15:44:20 +03:00
Fixing merge conflicts
This commit is contained in:
commit
5a1797cb21
@ -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::{
|
||||
|
Loading…
Reference in New Issue
Block a user