Merge branch 'zed2-room' into zed2
This commit is contained in:
commit
6172cd9015
14 changed files with 2311 additions and 27 deletions
|
@ -58,7 +58,7 @@ use project_settings::{LspSettings, ProjectSettings};
|
|||
use rand::prelude::*;
|
||||
use search::SearchQuery;
|
||||
use serde::Serialize;
|
||||
use settings2::{SettingsStore, Settings};
|
||||
use settings2::{Settings, SettingsStore};
|
||||
use sha2::{Digest, Sha256};
|
||||
use similar::{ChangeTag, TextDiff};
|
||||
use smol::channel::{Receiver, Sender};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue