ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-17 20:01:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad merge previous.

Browse Source
This commit is contained in:
C. Guy Yarvin 2016-09-03 22:56:02 -07:00
parent ff7ba86d6f
commit 8bdeb902d4
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arvo/eyre.hoon
View File

@ -1708,11 +1708,7 @@
~% %eyre-v ..is ~
|_ $: {usr/iden dom/path}
cor/(unit $@($~ vase))
<<<<<<< HEAD
req/(qeu {p/duct q/mark r/vase})
=======
{liv/? req/(qeu {p/duct q/mark r/vase:hiss})}
>>>>>>> 4c8e014
==
++ self .
++ abet +>(sec (~(put by sec) +<- +<+))