franklinblanco
/
Blender_bevy_components_workflow
mirror of https://github.com/kaosat-dev/Blender_bevy_components_workflow.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore(gltf_components): fixed bad merge

This commit is contained in:
kaosat.dev 2024-03-04 09:21:40 +01:00
parent d00caaf414
commit b73ecbabed
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/bevy_gltf_components/src/lib.rs
View File

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