conflicts

diff --git a/basis/classes/struct/struct-tests.factor b/basis/classes/struct/struct-tests.factor
index ed941fed62e1c40a616215b3c94461bf2ba77a0f..ae39f62868c88a7f00ccda714f992dff667da45c 100644 (file)
--- a/basis/classes/struct/struct-tests.factor
+++ b/basis/classes/struct/struct-tests.factor
@@ -9,7 +9,6 @@ system tools.test parser lexer eval layouts generic.single classes
 vocabs ;
 FROM: math => float ;
 FROM: specialized-arrays.private => specialized-array-vocab ;
-FROM: classes.struct.private => binary-zero? ;
 QUALIFIED-WITH: alien.c-types c
 SPECIALIZED-ARRAY: char
 SPECIALIZED-ARRAY: int
@@ -475,3 +474,7 @@ CONSULT: struct-test-delegate struct-test-delegator del>> ;
         7 >>a
         8 >>b
 ] unit-test
+<<<<<<< HEAD
+=======
+
+>>>>>>> alien.data: make binary-zero? public and move it from classes.struct.private

diff --git a/basis/classes/struct/struct.factor b/basis/classes/struct/struct.factor
index 4660f06d588c64e914c5b22ba0bb2057f180558f..c15e21f65184650c6063a8c9c62ccf265b67d526 100644 (file)
--- a/basis/classes/struct/struct.factor
+++ b/basis/classes/struct/struct.factor
@@ -11,7 +11,6 @@ namespaces assocs vocabs.parser math.functions
 classes.struct.bit-accessors bit-arrays
 stack-checker.dependencies system layouts ;
 FROM: delegate.private => group-words slot-group-words ;
-FROM: math => float ;
 QUALIFIED: math
 IN: classes.struct