publish / chat-store: fix merge issues

pkg/arvo/app/publish.hoon

@@ -2125,7 +2125,7 @@
     %-  json-response:gen
     %-  json-to-octs
     %+  frond:enjs:format  %publish-response
-    (notebooks-map-json our.bol books)
+    (notebooks-map our.bol books)
   ::
   ::  notes pagination
       [[[~ %json] [%'publish-view' %notes @ @ @ @ ~]] ~]

pkg/arvo/sur/chat-store.hoon

@@ -29,13 +29,7 @@
 ::
 +$  inbox  (map path mailbox)
 ::
-<<<<<<< HEAD
-+$  configs  (map path config)
-::
-+$  diff
-=======
 +$  chat-base
->>>>>>> 51f0e5eb3... apps: updated apps to use consistent %initial update
   $%  [%create =path]               ::  %create: create a mailbox at path
       [%delete =path]               ::  %delete: delete a mailbox at path
       [%message =path =envelope]    ::  %message: append a message to mailbox
@@ -49,15 +43,9 @@
       diff
   ==
 ::
-<<<<<<< HEAD
-+$  update
-  $%  [%keys keys=(set path)]
-      [%config =path =config]
-=======
 +$  chat-update
   $%  [%initial =inbox]
       [%keys keys=(set path)]
->>>>>>> 51f0e5eb3... apps: updated apps to use consistent %initial update
       [%messages =path start=@ud end=@ud envelopes=(list envelope)]
       diff
   ==