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,7 +1,8 @@
-use crate::features::FeatureFlag;
-
+use settings::macros::define_settings_group;
+use settings::{RespectUserSyncSetting, Setting, SupportedPlatforms, SyncToCloud};
 use galaxyui::{AppContext, SingletonEntity};
-use settings::{macros::define_settings_group, Setting, SupportedPlatforms, SyncToCloud};
+
+use crate::features::FeatureFlag;

 define_settings_group!(LigatureSettings, settings: [
    ligature_rendering_enabled: LigatureRenderingEnabled {