hark-graph-hook: fix conflict in merge

This commit is contained in:
Liam Fitzgerald 2020-11-11 10:36:32 +10:00
parent 35103ab394
commit a07f55b832
No known key found for this signature in database
GPG Key ID: D390E12C61D1CFFB

View File

@ -102,14 +102,12 @@
==
++ listen
|= [graph=resource =index:post]
^- (quip card _state)
:- (give:ha ~[/updates] [%listen graph index])
^+ state
state(watching (~(put in watching) [graph index]))
::
++ ignore
|= [graph=resource =index:post]
^- (quip card _state)
:- (give:ha ~[/updates] [%ignore graph index])
^+ state
state(watching (~(del in watching) [graph index]))
::
++ set-mentions