Fixing merge conflicts

This commit is contained in:
Mikayla Maki 2022-07-07 14:56:38 -07:00
commit 5a1797cb21

View file

@ -8,7 +8,6 @@ use alacritty_terminal::{
tty::{self, setup_env}, tty::{self, setup_env},
Term, Term,
}; };
use color_translation::{get_color_at_index, to_alac_rgb}; use color_translation::{get_color_at_index, to_alac_rgb};
use dirs::home_dir; use dirs::home_dir;
use futures::{ use futures::{