urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-14 20:02:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'typedclay' into test

Browse Source
This commit is contained in:
Philip C Monk 2015-04-28 14:20:40 -04:00
commit 7a21ebcd85
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/app/helm/core.hook
View File

@ -460,7 +460,7 @@
?~ wil
[ost %give %mean ~ %rejected ~]~
:~ [ost %pass / %a %cash p.u.bur q.u.bur u.wil]
[ost %pass / %c %plug our.hid %main (sein our.hid) %main]
[ost %pass / %c %plug our.hid %main (sein our.hid) %main-away]
[ost %give %nice ~]
==
::

8
main/arvo/clay.hoon
View File

@ -1541,12 +1541,12 @@
^+ +>
?: (~(has by mer) ali)
(error:he %already-merging ~)
?: &(=(0 let.dom) !?=(%init gem))
?: &(=(0 let.dom) !?=(?(%init %auto) gem))
(error:he %no-bob-desk ~)
=. gem.dat gem
=. cas.dat [%da now]
?: ?=(%init gem.dat)
fetch-ali
?: =(0 let.dom)
fetch-ali(gem.dat %init)
=+ (~(get by hit.dom) let.dom)
?~ -
(error:he %no-bob--version ~)
@ -2364,7 +2364,7 @@
^- (list move)
%+ turn (limo ~[%main])
|= syd=@tas
[hen %pass / %c %font p.q.hic syd bos syd]
[hen %pass / %c %font p.q.hic syd bos (cat 3 syd '-away')]
::
%info
?: =(%$ q.q.hic)