resolve merge errors

dotnet · Nov 20, 2024 · 0eaa744 · 0eaa744
1 parent ac909d2
commit 0eaa744
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/src/native/minipal/cpufeatures.h b/src/native/minipal/cpufeatures.h
@@ -32,11 +32,8 @@ enum XArchIntrinsicConstants
     XArchIntrinsicConstants_Avx10v1 = 0x40000,
     XArchIntrinsicConstants_Evex = 0x80000,
     XArchIntrinsicConstants_Apx = 0x100000,
-<<<<<<< HEAD
     XArchIntrinsicConstants_Vpclmulqdq = 0x200000,
-=======
-    XArchIntrinsicConstants_Avx10v2 = 0x200000,
->>>>>>> 40f24a90a65 (Add CPUID for AVX10.2)
+    XArchIntrinsicConstants_Avx10v2 = 0x400000,
 };
 #endif // HOST_X86 || HOST_AMD64