classes.struct: remove conflict marker from unit tests

diff --git a/basis/classes/struct/struct-tests.factor b/basis/classes/struct/struct-tests.factor
index ae39f62868c88a7f00ccda714f992dff667da45c..4ed7d9b446deb1716e6fa17433d0811bc2633fc8 100644 (file)
--- 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