clear merging conflict

2025-08-25 10:11:20 +08:00
parent 11b630ffa2
commit 88e9ee97e9
112 changed files with 1711 additions and 6912 deletions
@@ -45,7 +45,7 @@ namespace StgSharp.Timing
    public sealed class TimeSpanAwaitingToken : IDisposable
    {

-        private static readonly ConcurrentStackBuffer<int> s_unusedID = new(1);
+        private static readonly ConcurrentBufferStack<int> s_unusedID = new(1);

        private static int s_maxID;