chore(gltf_components): fixed bad merge

2024-03-04 09:21:40 +01:00 · 2024-03-04 09:21:40 +01:00 · b73ecbabed
parent d00caaf414
commit b73ecbabed
1 changed files with 1 additions and 5 deletions
--- a/crates/bevy_gltf_components/src/lib.rs
+++ b/crates/bevy_gltf_components/src/lib.rs
@ -8,13 +8,9 @@ pub mod process_gltfs;
 pub use process_gltfs::*;

 use bevy::{
-<<<<<<< HEAD
-    ecs::{component::Component, reflect::ReflectComponent, system::Resource},
-=======
    app::Startup,
-    ecs::system::{Res, Resource},
+    ecs::{component::Component, reflect::ReflectComponent, system::{Res, Resource}},
    log::warn,
->>>>>>> 9cb9dda5d35c635d367fa81ca1a6c752cda9bc02
    prelude::{App, IntoSystemConfigs, Plugin, SystemSet, Update},
    reflect::Reflect,
 };