From f319cd6c8105e5218ca1e433e7da8fc03c0f8814 Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Thu, 1 Nov 2018 01:18:50 -0400 Subject: [PATCH] fixes merge conflict resolution in the previous. mea maxima culpa --- vere/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vere/main.c b/vere/main.c index d7ff119e0..17017fe7c 100644 --- a/vere/main.c +++ b/vere/main.c @@ -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. */ }