Fix merge conflicts

ECDAR-AAU-SW-P5 · Dec 15, 2023 · c55fdaf · c55fdaf
1 parent 2e040f8
commit c55fdaf
Showing 1 changed file with 2 additions and 11 deletions.
diff --git a/src/system/executable_query.rs b/src/system/executable_query.rs
@@ -1,21 +1,12 @@
-<<<<<<< HEAD:src/System/executable_query.rs
-use crate::DataReader::component_loader::ComponentLoader;
-use crate::ModelObjects::State;
-use crate::System::reachability;
-use crate::System::refine;
-use crate::System::save_component::combine_components;
-use crate::TransitionSystems::TransitionSystemPtr;
-use edbm::util::constraints::ClockIndex;
-use std::cmp;
-=======
 use crate::data_reader::component_loader::ComponentLoader;
 use crate::extract_system_rep::SystemRecipe;
 use crate::model_objects::State;
 use crate::system::reachability;
 use crate::system::refine;
 use crate::system::save_component::combine_components;
 use crate::transition_systems::TransitionSystemPtr;
->>>>>>> origin/symboltable-compiled-comp-6:src/system/executable_query.rs
+use edbm::util::constraints::ClockIndex;
+use std::cmp;
 
 use super::query_failures::PathFailure;
 use super::query_failures::QueryResult;