mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-09-11 10:46:43 +03:00
hark-graph-hook: fix merge artifact
This commit is contained in:
parent
616ab66f26
commit
70bba97180
@ -269,22 +269,8 @@
|
||||
^- (quip card _this)
|
||||
?+ wire (on-arvo:def wire sign-arvo)
|
||||
::
|
||||
<<<<<<< HEAD:pkg/landscape/app/hark-graph-hook.hoon
|
||||
[%validator @ ~]
|
||||
:_ this
|
||||
=* validator i.t.wire
|
||||
=/ =rave:clay [%next %f [%da now.bowl] /[validator]/notification-kind]
|
||||
[%pass wire %arvo %c %warp our.bowl [q.byk.bowl `rave]]~
|
||||
||||||| 7ac718a2c7:pkg/arvo/app/hark-graph-hook.hoon
|
||||
[%validator @ ~]
|
||||
:_ this
|
||||
=* validator i.t.wire
|
||||
=/ =rave:clay [%next %f [%da now.bowl] /[validator]/notification-kind]
|
||||
[%pass wire %arvo %c %warp our.bowl [%home `rave]]~
|
||||
=======
|
||||
:: no longer necessary
|
||||
[%validator @ ~] [~ this]
|
||||
>>>>>>> master:pkg/arvo/app/hark-graph-hook.hoon
|
||||
==
|
||||
++ on-fail on-fail:def
|
||||
--
|
||||
|
Loading…
Reference in New Issue
Block a user