Removed merge conflict message.

Tape-Worm · Feb 12, 2022 · 53b84aa · 53b84aa
1 parent 78cbeb3
commit 53b84aa
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/Gorgon/Gorgon.Renderers/Gorgon2D/Renderables/_Internal/SpriteTransformer.cs b/Gorgon/Gorgon.Renderers/Gorgon2D/Renderables/_Internal/SpriteTransformer.cs
@@ -26,17 +26,6 @@
 
 using System.Numerics;
 using System.Runtime.CompilerServices;
-
-/* Unmerged change from project 'Gorgon.Renderers.Gorgon2D (net5.0-windows)'
-Before:
-using Gorgon.Renderers.Geometry;
-using System.Runtime.CompilerServices;
-using Gorgon.Graphics;
-After:
-using Gorgon.Graphics;
-using System.Runtime.Math;
-using Gorgon.Renderers.Geometry;
-*/
 using Gorgon.Math;
 using Gorgon.Renderers.Geometry;