Make %hall and %talk started on boot.

app/hall.hoon

@@ -22,22 +22,12 @@
 ::        ==
 ::
 ::::
-<<<<<<< HEAD
-  ::
 =,  hall-sur
 =,  hall-lib
-=>  :>  #
-    :>  #  %arch
-    :>  #
-    :>    data structures
-=======
-  ::  
-=,  hall
 =>  ::  #
     ::  #  %arch
     ::  #
     ::    data structures
->>>>>>> research-tome
     ::
     |%
     ::  #  %state
@@ -592,11 +582,7 @@
       =-  (ta-think & our.bol tos)
       |-  ^-  tos/(list thought)
       ?~  ses  ~
-<<<<<<< HEAD
       =^  sir  eny.bol  ~(uniq hall-lib bol)
-=======
-      =^  sir  eny.bol  ~(uniq ^hall bol)
->>>>>>> research-tome
       :_  $(ses t.ses)
       [sir aud [now.bol i.ses]]
     ::
@@ -2802,7 +2788,7 @@
   ::
   |=  pax/path
   ^-  (quip move _+>)
-  ?:  ?=({$sole *} pax)  ~&(%hall-no-sole !!)
+  ?:  ?=([%sole *] pax)  ~&(%hall-no-sole !!)
   =+  qer=(path-to-query pax)
   ?.  (leak src.bol qer)  ~&(%peer-invisible !!)
   =^  mos  +>.$

app/talk.hoon

@@ -1005,11 +1005,7 @@
       ^+  +>
       ?~  lit  +>
       =^  lic  say.she
-<<<<<<< HEAD
           (~(transmit sole-lib say.she) `sole-edit`?~(t.lit i.lit [%mor lit]))
-=======
-          (~(transmit ^^sole say.she) `sole-edit`?~(t.lit i.lit [%mor lit]))
->>>>>>> research-tome
       (sh-fact [%mor [%det lic] ?~(err ~ [%err u.err]~)])
     ::
     ++  sh-obey
@@ -1031,11 +1027,7 @@
       =+  buf=buf.say.she
       =?  ..sh-obey  &(?=({$';' *} buf) !?=($reply -.u.jub))
         (sh-note (tufa `(list @)`buf))
-<<<<<<< HEAD
       =^  cal  say.she  (~(transmit sole-lib say.she) [%set ~])
-=======
-      =^  cal  say.she  (~(transmit ^^sole say.she) [%set ~])
->>>>>>> research-tome
       %+  sh-fact  %mor
       :~  [%nex ~]
           [%det cal]

lib/hood/drum.hoon

@@ -78,16 +78,15 @@
   %-  ~(gas in *(set well:gall))
   ^-  (list well:gall)
   =+  myr=(clan:title our)
-  ::  TODO: Make sure all the other apps compile later.
   ::
-  ::  ?:  ?=($pawn myr)
-  ::    [[%base %collections] [%base %hall] [%base %talk] [%base %dojo] ~]
+  ?:  ?=($pawn myr)
+    [[%base %collections] [%base %hall] [%base %talk] [%base %dojo] ~]
   :~  [%home %collections]
       [%home %acme]
       [%home %dns]
       [%home %dojo]
-      ::  [%home %hall]
-      ::  [%home %talk]
+      [%home %hall]
+      [%home %talk]
   ==
 ::
 ++  deft-fish                                           ::  default connects