Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/main' into zed2-workspace

Browse source
This commit is contained in:
Conrad Irwin 2023-11-02 13:16:24 -06:00
commit 269a72464d
128 changed files with 1718 additions and 1670 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/zed2/src/zed2.rs
View file

@ -5,7 +5,8 @@ mod open_listener;
pub use assets::*;
use collections::HashMap;
use gpui2::{
use client::{Client, UserStore};
use gpui::{
point, px, AppContext, AsyncAppContext, AsyncWindowContext, Point, Task, TitlebarOptions,
WeakView, WindowBounds, WindowKind, WindowOptions,
};