From 3dd25c322247ae0a8c5d444f0225fd8a8e76d964 Mon Sep 17 00:00:00 2001
From: jake <jake@sharnoth.com>
Date: Mon, 2 Nov 2020 00:03:22 -0700
Subject: [PATCH] merge conflict

---
 src/ship/ship.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ship/ship.rs b/src/ship/ship.rs
index 2c04c8a..a717acb 100644
--- a/src/ship/ship.rs
+++ b/src/ship/ship.rs
@@ -414,7 +414,7 @@ impl<EG: EntityGateway> ShipServerState<EG> {
                 handler::message::player_unequips_item(id, &player_unequip_item, &mut self.entity_gateway, &mut self.clients, &mut self.item_manager).await?
             },
             GameMessage::SortItems(sort_items) => {
-                handler::message::player_sorts_items(id, sort_items, &mut self.entity_gateway, &mut self.clients, &mut self.item_manager).await
+                handler::message::player_sorts_items(id, sort_items, &mut self.entity_gateway, &mut self.clients, &mut self.item_manager).await?
             },
             _ => {
                 let cmsg = msg.clone();