resolve conflict

bevyengine · Nov 27, 2020 · 573cce0 · 573cce0
1 parent cd95e77
commit 573cce0
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/crates/bevy_core/src/time/timer.rs b/crates/bevy_core/src/time/timer.rs
@@ -1,5 +1,3 @@
-use crate::time::Time;
-use bevy_ecs::prelude::*;
 use bevy_reflect::{Reflect, ReflectComponent};
 use bevy_utils::Duration;