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

crates/integration/src/test/settings_file_errors.rs

@@ -5,16 +5,15 @@
 //! or individual setting values are invalid — and that the banner clears
 //! when the file is fixed.
 
-use galaxy::{
-    features::FeatureFlag,
-    integration_testing::{
-        step::new_step_with_default_assertions,
-        terminal::wait_until_bootstrapped_single_pane_for_tab, view_getters::workspace_view,
-    },
-};
-use galaxyui::{async_assert, integration::TestStep};
 use std::time::Duration;
 
+use warp::features::FeatureFlag;
+use warp::integration_testing::step::new_step_with_default_assertions;
+use warp::integration_testing::terminal::wait_until_bootstrapped_single_pane_for_tab;
+use warp::integration_testing::view_getters::workspace_view;
+use galaxyui_core::async_assert;
+use galaxyui_core::integration::TestStep;
+
 use super::{new_builder, Builder};
 
 /// Helper: returns the path to the TOML settings file.