Fix conflict

[factor.git] / basis / cpu / x86 / 32 / 32.factor

diff --git a/basis/cpu/x86/32/32.factor b/basis/cpu/x86/32/32.factor
index 85db5fb09cdceb7a5f7492d9b90dceedc575ff1d..7a7d1befd92ff42fe6116a6775622e1770e13445 100755 (executable)
--- a/basis/cpu/x86/32/32.factor
+++ b/basis/cpu/x86/32/32.factor
@@ -322,4 +322,4 @@ os windows? [
     4 "double" c-type (>>align)
 ] unless
 
-"cpu.x86.features" require
+check-sse