ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2025-01-07 07:30:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:urbit/urbit

Browse Source 
Conflicts:
	urb/urbit.pill
This commit is contained in:
C. Guy Yarvin 2014-08-05 12:50:16 -07:00
commit 315b571959
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
v/unix.c
View File

@ -892,8 +892,8 @@ _unix_desk_sync_into(u2_noun who,
xun = _unix_dir_ankh(dir_u); xun = _unix_dir_ankh(dir_u);
bur = _unix_desk_peek(hox, u2k(syd), u2k(u2A->wen)); bur = _unix_desk_peek(hox, u2k(syd), u2k(u2A->wen));
if ( (u2_no == u2_sing(xun, bur)) && if ( (u2_no == u2_sing(u2h(xun), u2h(bur)))) //&&
(u2_no == _unix_ankh_sing(xun, bur)) ) // (u2_no == _unix_ankh_sing(xun, bur)) )
{ {
doz = u2_dc("cost", xun, bur); doz = u2_dc("cost", xun, bur);