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/GameObjects/Components/Mobs/HeatResistanceComponent.cs
+++ b/Content.Server/GameObjects/Components/Mobs/HeatResistanceComponent.cs
@@ -1,10 +1,6 @@
-using System;
-using Content.Shared.GameObjects.Components.Inventory;
+using Content.Shared.GameObjects.Components.Inventory;
 using Robust.Shared.GameObjects;
-using CannyFastMath;
-using Content.Server.GameObjects.Components.Items.Clothing;
 using Math = CannyFastMath.Math;
-using MathF = CannyFastMath.MathF;

 namespace Content.Server.GameObjects
 {