Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge conflict fixes

Browse Source
This commit is contained in:
DrSmugleaf
2020-07-07 00:23:41 +02:00
parent b850ac2437
commit 7cc5a3fb65
23 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Server/AI/Utility/Considerations/Clothing/ClothingInInventoryCon.cs
View File

@@ -2,7 +2,6 @@ using Content.Server.AI.Utility.Curves;
using Content.Server.AI.WorldState;
using Content.Server.AI.WorldState.States.Inventory;
using Content.Server.GameObjects;
using Content.Server.GameObjects.Components.Items.Clothing;
using Content.Shared.GameObjects.Components.Inventory;
namespace Content.Server.AI.Utility.Considerations.Clothing