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

Merge pull request #1048 from urbit/fake-no-hash-merge-fix

Browse Source 
fix bad merge conflict resolution (in disabled battery hashing)
This commit is contained in:
Joe Bryan 2018-11-01 01:21:11 -04:00 committed by GitHub
commit a9f9dfc2c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vere/main.c
View File

@ -222,7 +222,7 @@ _main_getopt(c3_i argc, c3_c** argv)
u3_Host.ops_u.net = c3y; /* remote networking is always on in real mode. */
}
if ( u3_Host.ops_u.fak == c3y ) {
if ( 0 != u3_Host.ops_u.fak_c ) {
u3_Host.ops_u.has = c3y; /* no battery hashing on fake ships. */
}