classes.struct: remove conflict marker from unit tests

2010-06-22 14:35:49 -04:00 · 2010-06-22 14:35:49 -04:00 · 7d64fe50a1
parent 167aff1b57
commit 7d64fe50a1
1 changed files with 0 additions and 4 deletions
--- a/basis/classes/struct/struct-tests.factor
+++ b/basis/classes/struct/struct-tests.factor
@ -474,7 +474,3 @@ 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