clear merging conflict

2025-08-25 10:11:20 +08:00
parent 11b630ffa2
commit 88e9ee97e9
112 changed files with 1711 additions and 6912 deletions
@@ -28,17 +28,12 @@
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-using StgSharp.Entities;
-
 using System;
-using System.Buffers;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
+using System.Drawing;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;

 using Allocator = StgSharp.HighPerformance.Memory.HybridLayerSegregatedFitAllocator;

@@ -48,7 +43,6 @@ namespace StgSharp.HighPerformance.Memory
    {

        internal readonly byte* BufferPointer;
-
        internal readonly Allocator.Entry* EntryHandle;
        public readonly uint AllocSize;