steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

classes.struct: remove conflict marker from unit tests

db4
Slava Pestov 2010-06-22 14:35:49 -04:00
parent 167aff1b57
commit 7d64fe50a1
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
basis/classes/struct/struct-tests.factor
View File

@ -474,7 +474,3 @@ CONSULT: struct-test-delegate struct-test-delegator del>> ;
7 >>a 7 >>a
8 >>b 8 >>b
] unit-test ] unit-test
<<<<<<< HEAD
=======
>>>>>>> alien.data: make binary-zero? public and move it from classes.struct.private