youmuliu/stgsharp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove branch conflict

Browse Source
This commit is contained in:
Nitload
2025-12-21 23:20:56 +08:00
parent cffe44772e
commit ca5fc9a3f5
13 changed files with 17 additions and 1058 deletions
Download Patch File Download Diff File Expand all files Collapse all files
StgSharp.Mathematics/Numeric/MatrixParallel.cs
+1 -32
View File
@@ -1,12 +1,4 @@
<<<<<<< HEAD
<<<<<<< HEAD
//-----------------------------------------------------------------------
=======
//-----------------------------------------------------------------------
>>>>>>> 7bcb460a3994dda40f24cae0044b5a36f4f16515
=======
//-----------------------------------------------------------------------
>>>>>>> stgsharp-dev/giga
//-----------------------------------------------------------------------
// -----------------------------------------------------------------------
// file="MatrixParallel"
// Project: StgSharp
@@ -35,20 +27,6 @@
// -----------------------------------------------------------------------
using StgSharp.Collections;
using System;
<<<<<<< HEAD
<<<<<<< HEAD
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StgSharp.Mathematics.Numeric
{
public static class MatrixParallel
=======
using System.Collections.Concurrent;
=======
>>>>>>> stgsharp-dev/giga
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -57,7 +35,6 @@ using System.Threading.Tasks;
namespace StgSharp.Mathematics.Numeric
{
public static partial class MatrixParallel
>>>>>>> 7bcb460a3994dda40f24cae0044b5a36f4f16515
{
private static bool _meaningful;
@@ -119,12 +96,4 @@ namespace StgSharp.Mathematics.Numeric
}
}
<<<<<<< HEAD
<<<<<<< HEAD
}
=======
}
>>>>>>> 7bcb460a3994dda40f24cae0044b5a36f4f16515
=======
}
>>>>>>> stgsharp-dev/giga