rebases are hard

This commit is contained in:
jake 2020-10-30 21:27:00 -06:00
parent b517fb561c
commit ad612615c7

@ -48,7 +48,6 @@ pub enum ItemManagerError {
CannotGetIndividualItem, CannotGetIndividualItem,
InvalidSlot(u8, u8), // slots available, slot attempted InvalidSlot(u8, u8), // slots available, slot attempted
NoArmorEquipped, NoArmorEquipped,
ItemIdNotInInventory(ClientItemId),
GatewayError(#[from] crate::entity::gateway::GatewayError) GatewayError(#[from] crate::entity::gateway::GatewayError)
} }