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

Fix broken merge

Browse source
This commit is contained in:
Mikayla Maki 2023-01-20 09:19:58 -08:00
parent 95e661a78c
commit 97203e1e02
6 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/workspace/src/workspace.rs
View file

@ -31,18 +31,14 @@ use futures::{
};
use gpui::{
actions,
color::Color,
elements::*,
geometry::{
rect::RectF,
vector::{vec2f, Vector2F},
},
geometry::vector::Vector2F,
impl_actions, impl_internal_actions,
keymap_matcher::KeymapContext,
platform::{CursorStyle, WindowOptions},
AnyModelHandle, AnyViewHandle, AppContext, AsyncAppContext, Entity, ModelContext, ModelHandle,
MouseButton, MutableAppContext, PathPromptOptions, PromptLevel, RenderContext, SizeConstraint,
Task, View, ViewContext, ViewHandle, WeakViewHandle, WindowBounds, WindowKind,
Task, View, ViewContext, ViewHandle, WeakViewHandle,
};
use item::{FollowableItem, FollowableItemHandle, Item, ItemHandle, ProjectItem};
use language::LanguageRegistry;