From 7d64fe50a11c386542f0db644a52b6255115854b Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@factorcode.org>
Date: Tue, 22 Jun 2010 14:35:49 -0400
Subject: [PATCH] classes.struct: remove conflict marker from unit tests

---
 basis/classes/struct/struct-tests.factor | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/basis/classes/struct/struct-tests.factor b/basis/classes/struct/struct-tests.factor
index ae39f62868..4ed7d9b446 100644
--- 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