From 925489eba63ae2288aca3fdc4db0e36602d8c825 Mon Sep 17 00:00:00 2001
From: Ted Blackman <ted@tlon.io>
Date: Wed, 30 Oct 2019 16:23:37 -0400
Subject: [PATCH] /sys: various merge fixes

---
 pkg/arvo/sys/arvo.hoon      | 2 --
 pkg/arvo/sys/vane/behn.hoon | 2 --
 pkg/arvo/sys/vane/clay.hoon | 7 +++----
 pkg/arvo/sys/zuse.hoon      | 2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkg/arvo/sys/arvo.hoon b/pkg/arvo/sys/arvo.hoon
index 4bab841153..bb6b4260c2 100644
--- a/pkg/arvo/sys/arvo.hoon
+++ b/pkg/arvo/sys/arvo.hoon
@@ -258,7 +258,6 @@
     ++  slur-g  ~/(%slur-g |=({gat/vase hil/mill} =+(%g (slur gat hil))))
     ++  slur-i  ~/(%slur-i |=({gat/vase hil/mill} =+(%i (slur gat hil))))
     ++  slur-j  ~/(%slur-j |=({gat/vase hil/mill} =+(%j (slur gat hil))))
-    ++  slur-k  ~/(%slur-k |=({gat/vase hil/mill} =+(%k (slur gat hil))))
     ++  slur-z  ~/(%slur-z |=({gat/vase hil/mill} =+(%z (slur gat hil))))
     ::
     ++  slur-pro                                        ::  profiling slur
@@ -274,7 +273,6 @@
         $g  (slur-g gat hil)
         $i  (slur-i gat hil)
         $j  (slur-j gat hil)
-        $k  (slur-k gat hil)
       ==
     ::
     ++  song                                            ::  reduce metacard
diff --git a/pkg/arvo/sys/vane/behn.hoon b/pkg/arvo/sys/vane/behn.hoon
index d715451bf1..b0a95620a2 100644
--- a/pkg/arvo/sys/vane/behn.hoon
+++ b/pkg/arvo/sys/vane/behn.hoon
@@ -63,8 +63,6 @@
     ::
     ?:  =(~ timers.state)  ~|  %behn-crud-no-timer^tag^error  !!
     ::
-    ~&  %behn-crud-tag^tag
-    %-  (slog error)
     (wake `error)
   ::  +rest: cancel the timer at :date, then adjust unix wakeup
   ::  +wait: set a new timer at :date, then adjust unix wakeup
diff --git a/pkg/arvo/sys/vane/clay.hoon b/pkg/arvo/sys/vane/clay.hoon
index 268bbe127b..11f4eed461 100644
--- a/pkg/arvo/sys/vane/clay.hoon
+++ b/pkg/arvo/sys/vane/clay.hoon
@@ -2686,7 +2686,7 @@
     %-  (sloy-light ski)
     =/  pur=spur
       /(scot %p who)
-    [[151 %noun] %k our %rift da+now pur]
+    [[151 %noun] %j our %rift da+now pur]
   ::
   ::  Handle `%sing` requests
   ::
@@ -4618,8 +4618,7 @@
       %done
     ?~  error=error.q.hin
       [~ ..^$]
-    ~&  [%clay-lost u.error tea]
-    %-  (slog >tag.u.error< tang.u.error)
+    %-  (slog >%clay-lost< >tag.u.error< tang.u.error)
     [~ ..^$]
   ==
 ::
@@ -4679,5 +4678,5 @@
   %-  (sloy-light ski)
   =/  pur=spur
     /(scot %p who)
-  [[151 %noun] %k our %rift da+now pur]
+  [[151 %noun] %j our %rift da+now pur]
 --
diff --git a/pkg/arvo/sys/zuse.hoon b/pkg/arvo/sys/zuse.hoon
index 3dd44a67bc..a23c6df306 100644
--- a/pkg/arvo/sys/zuse.hoon
+++ b/pkg/arvo/sys/zuse.hoon
@@ -6747,7 +6747,7 @@
   ++  saxo                                              ::  autocanon
     |=  [our=ship now=@da who=ship]
     .^  (list ship)
-        %k
+        %j
         /(scot %p our)/saxo/(scot %da now)/(scot %p who)
     ==
   ::                                                    ::  ++sein:title