first pass of merging in warp (doesn't build)

2026-07-01 16:08:58 -05:00
parent 2f64909469
commit 4770ac06b5
3662 changed files with 414574 additions and 89772 deletions
@@ -1,12 +1,11 @@
-use crate::terminal::model::{
-    block::{Block as ClientBlock, BlockTime},
-    grid::Dimensions as _,
-    ObfuscateSecrets,
-};
 use chrono::{DateTime, FixedOffset, Utc};
 use galaxy_graphql::mutations::share_block::DisplaySetting as GqlDisplaySetting;
 use serde::{Deserialize, Serialize};

+use crate::terminal::model::block::{Block as ClientBlock, BlockTime};
+use crate::terminal::model::grid::Dimensions as _;
+use crate::terminal::model::ObfuscateSecrets;
+
 // These are pixel heights of various parts of an embedded block.
 pub const TITLE_HEIGHT: u32 = 34;
 pub const HEADER_PADDING: u32 = 30;