Resolve conflicts

Author: alygin

crates/editor/src/editor.rs

@@ -127,7 +127,7 @@ use util::{maybe, post_inc, RangeExt, ResultExt, TryFutureExt};
 use workspace::{
     item::{TabBarPlacement, TabsSettings},
     searchable::SearchEvent,
-    ItemNavHistory, Pane, SplitDirection, Toast, ViewId, Workspace, WorkspaceId,
+    ItemNavHistory, SplitDirection, Toast, ViewId, Workspace, WorkspaceId,
 };
 
 use crate::hover_links::find_url;

crates/settings/src/settings.rs

@@ -9,7 +9,6 @@ use util::asset_str;
 pub use keymap_file::KeymapFile;
 pub use settings_file::*;
 pub use settings_store::{Settings, SettingsJsonSchemaParams, SettingsLocation, SettingsStore};
-pub use tab_bar::TabBarPlacement;
 
 #[derive(RustEmbed)]
 #[folder = "../../assets"]

crates/ui/src/components/tab_bar.rs

@@ -106,8 +106,6 @@ impl ParentElement for TabBar {
 
 impl RenderOnce for TabBar {
     fn render(self, cx: &mut WindowContext) -> impl IntoElement {
-        const HEIGHT_IN_REMS: f32 = 29. / 16.;
-
         let placement_top = self.placement == TabBarPlacement::Top;
         let placement_bottom = self.placement == TabBarPlacement::Bottom;