Fix some rebase issues

crates/re_space_view_bar_chart/src/view_part_system.rs

@@ -3,7 +3,8 @@ use std::collections::BTreeMap;
 use re_arrow_store::LatestAtQuery;
 use re_components::Tensor;
 use re_data_store::EntityPath;
-use re_types::Loggable as _;
+use re_log_types::{TimeInt, Timeline};
+use re_types::{ComponentName, Loggable as _};
 use re_viewer_context::{
     ArchetypeDefinition, SpaceViewSystemExecutionError, ViewContextCollection, ViewPartSystem,
     ViewQuery, ViewerContext,

crates/re_space_view_tensor/src/view_part_system.rs

@@ -1,7 +1,8 @@
 use re_arrow_store::LatestAtQuery;
 use re_components::{DecodedTensor, Tensor};
 use re_data_store::{EntityPath, EntityProperties, InstancePath};
-use re_types::{components::InstanceKey, Loggable as _};
+use re_log_types::{TimeInt, Timeline};
+use re_types::{components::InstanceKey, ComponentName, Loggable as _};
 use re_viewer_context::{
     ArchetypeDefinition, SpaceViewSystemExecutionError, TensorDecodeCache, ViewContextCollection,
     ViewPartSystem, ViewQuery, ViewerContext,

crates/re_types/source_hash.txt

@@ -1,12 +1,4 @@
 # This is a sha256 hash for all direct and indirect dependencies of this crate's build script.
 # It can be safely removed at anytime to force the build script to run again.
 # Check out build.rs to see how it's computed.
-<<<<<<< HEAD
-<<<<<<< HEAD
-dcb43f1ac516a3bce624b6310657e3cbf79e4478d3e2c523a528ff19318913be
-=======
-38cf451937b585b78a47d2b1d5542f761bf3bd56d2fdd26eb4172c7ed5fcbf20
->>>>>>> 738304b83 (Replace the old serialization usages)
-=======
-3ceb8d9c3a847998763d861ce1ae228bf01a323883fcdc40be848557a1ff334d
->>>>>>> a6e61c5bc (CI fixes)
+6d87389cbdb8ab099fa99159ded37aeefd43d592dce6d01cca1e7b89b155a63e

crates/re_viewport/src/space_view_heuristics.rs

@@ -1,21 +1,12 @@
 use ahash::HashMap;
 use itertools::Itertools;
 use nohash_hasher::IntSet;
-<<<<<<< HEAD
-=======
-use re_arrow_store::{DataStore, LatestAtQuery, Timeline};
+use re_arrow_store::{LatestAtQuery, Timeline};
 use re_components::{DisconnectedSpace, Pinhole, Tensor};
 use re_data_store::EntityPath;
-use re_types::{ComponentName, Loggable as _};
 use re_viewer_context::{SpaceViewClassName, ViewerContext};
->>>>>>> 1e25abf51 (Migrating DataCell to re_types::Component)
 
-use re_arrow_store::{LatestAtQuery, Timeline};
-use re_components::{DisconnectedSpace, Pinhole, Tensor};
-use re_data_store::EntityPath;
-use re_viewer_context::{
-    AutoSpawnHeuristic, SpaceViewClassName, ViewPartCollection, ViewerContext,
-};
+use re_viewer_context::{AutoSpawnHeuristic, ViewPartCollection};
 
 use crate::{space_info::SpaceInfoCollection, space_view::SpaceViewBlueprint};