From 9f0da5c1951aec25c432dff013c16e4f09244efd Mon Sep 17 00:00:00 2001
From: daanx <daanx@effp.org>
Date: Tue, 4 Apr 2023 16:48:02 -0700
Subject: [PATCH] merge ide files

---
 ide/vs2022/mimalloc-override.vcxproj | 3 ---
 ide/vs2022/mimalloc.vcxproj          | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/ide/vs2022/mimalloc-override.vcxproj b/ide/vs2022/mimalloc-override.vcxproj
index 5c0513c6..52ed5282 100644
--- a/ide/vs2022/mimalloc-override.vcxproj
+++ b/ide/vs2022/mimalloc-override.vcxproj
@@ -257,11 +257,8 @@
     </ClCompile>
     <ClCompile Include="..\..\src\page.c" />
     <ClCompile Include="..\..\src\random.c" />
-<<<<<<< HEAD
     <ClCompile Include="..\..\src\segment-cache.c" />
-=======
     <ClCompile Include="..\..\src\segment-map.c" />
->>>>>>> dev-reset
     <ClCompile Include="..\..\src\segment.c" />
     <ClCompile Include="..\..\src\stats.c" />
   </ItemGroup>
diff --git a/ide/vs2022/mimalloc.vcxproj b/ide/vs2022/mimalloc.vcxproj
index 36100a79..33a719c1 100644
--- a/ide/vs2022/mimalloc.vcxproj
+++ b/ide/vs2022/mimalloc.vcxproj
@@ -235,11 +235,8 @@
     </ClCompile>
     <ClCompile Include="..\..\src\page.c" />
     <ClCompile Include="..\..\src\random.c" />
-<<<<<<< HEAD
     <ClCompile Include="..\..\src\segment-cache.c" />
-=======
     <ClCompile Include="..\..\src\segment-map.c" />
->>>>>>> dev-reset
     <ClCompile Include="..\..\src\segment.c" />
     <ClCompile Include="..\..\src\os.c" />
     <ClCompile Include="..\..\src\stats.c" />