Rebased to main

This commit is contained in:
Mikayla Maki 2022-11-18 17:06:33 -08:00
parent a0cb6542ba
commit 992b94eef3
8 changed files with 10 additions and 14 deletions

View file

@ -34,9 +34,7 @@ use mappings::mouse::{
use procinfo::LocalProcessInfo;
use settings::{AlternateScroll, Settings, Shell, TerminalBlink};
use terminal_container_view::TerminalContainer;
use util::ResultExt;
use workspace::register_deserializable_item;
use std::{
cmp::min,