mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
remove merge artifact
This commit is contained in:
parent
12e9b491a4
commit
029f3e2a1f
@ -6,7 +6,7 @@ use crate::{
|
||||
EditableSettings, Settings,
|
||||
};
|
||||
use common::{
|
||||
comp::{self, Admin, Health, Player, Stats},
|
||||
comp::{self, Admin, Player, Stats},
|
||||
event::{ClientDisconnectEvent, EventBus, MakeAdminEvent},
|
||||
recipe::{default_component_recipe_book, default_recipe_book, default_repair_recipe_book},
|
||||
resources::TimeOfDay,
|
||||
|
Loading…
Reference in New Issue
Block a user