From ec2b8da7c7c5712bd687273434ae4fa4daba4afb Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Wed, 16 Jun 2010 16:21:00 -0500 Subject: [PATCH] conflicts --- basis/classes/struct/struct-tests.factor | 5 ++++- basis/classes/struct/struct.factor | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/basis/classes/struct/struct-tests.factor b/basis/classes/struct/struct-tests.factor index ed941fed62..ae39f62868 100644 --- 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 4660f06d58..c15e21f651 100644 --- 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