Merge conflict fixes

2020-07-07 00:23:41 +02:00
parent b850ac2437
commit 7cc5a3fb65
23 changed files with 13 additions and 23 deletions
--- a/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs
+++ b/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs
@@ -1,4 +1,5 @@
 using Content.Server.GameObjects;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.EntitySystems.Click;
 using Content.Server.Utility;
 using Robust.Shared.Containers;