From ceb79e045f0e0320e01fbf0125aee598cfecf5da Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Fri, 8 May 2015 10:53:28 -0700 Subject: [PATCH] Prepare the doll. --- base/arvo/doll.hoon | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/base/arvo/doll.hoon b/base/arvo/doll.hoon index bfde6dbcb..53ff45f48 100644 --- a/base/arvo/doll.hoon +++ b/base/arvo/doll.hoon @@ -274,16 +274,13 @@ (done %blit [bit ~]) :: ++ init :: initialize - ~& [%dill-init our] + ~& [%doll-init our] =+ myt=(flop (need tem)) =. tem ~ -<<<<<<< HEAD:urb/zod/base/arvo/dill.hoon =. moz :_(moz [hen %pass / %c %font our %home our %base]) - =. moz :_(moz [hen %pass / %g %show [our [ram ~]] our ~]) -======= - =. moz :_(moz [hen %pass ~ %b %conf [[our ram] %load our %main]]) + :: =. moz :_(moz [hen %pass / %g %show [our [ram ~]] our ~]) + =. moz :_(moz [hen %pass ~ %b %conf [[our ram] %load our %base]]) =. moz :_(moz [hen %pass ~ %b %deal [our our] ram %peer ~]) ->>>>>>> newgall^:urb/zod/arvo/dill.hoon |- ^+ +> ?~ myt +> $(myt t.myt, +> (send i.myt))