Fix merge...

This commit is contained in:
Jared Hance 2014-07-22 15:33:17 -04:00
parent 27f38c45bd
commit 38122c5b5a

View File

@ -1058,10 +1058,6 @@
:- %mut
((diff (zump (zaal u.leb))) zeq zoq)
::
=======
++ ze
|_ [lim=@da dome]
>>>>>>> master
++ aeon :: aeon:ze
|= lok=case :: act count through
^- (unit ,@ud)