remove branch conflict

StgSharp.Mathematics/Numeric/MatrixCompute.Additional.cs

@@ -26,17 +26,11 @@
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
 using StgSharp.HighPerformance;
-<<<<<<< HEAD
-using System;
-using System.Collections.Generic;
-using System.Linq;
-=======
 using StgSharp.Internal;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.CompilerServices;
->>>>>>> stgsharp-dev/giga
 using System.Text;
 using System.Threading.Tasks;
 
@@ -45,19 +39,6 @@ namespace StgSharp.Mathematics.Numeric
     public partial class MatrixCompute
     {
 
-<<<<<<< HEAD
-        private static unsafe void ComputeFmaPanelF32(
-                                   MatrixKernel* left,
-                                   MatrixKernel* right,
-                                   MatrixKernel* ans,
-                                   ScalarPacket* scalar)
-        {
-            const int eSize = 32;
-            int colum = scalar->Data<int>(0);
-            int row = scalar->Data<int>(1);
-            int k = 
-
-=======
         internal static unsafe void ComputeFmaPanelF32(MatrixParallelTaskPackage* p)
         {
             int size = p->ElementSize;
@@ -97,7 +78,6 @@ namespace StgSharp.Mathematics.Numeric
             MatrixPanel.Destroy(leftPanel);
             MatrixPanel.Destroy(rightPanel);
             MatrixPanel.Destroy(ansPanel);
->>>>>>> stgsharp-dev/giga
         }
 
     }