# HG changeset patch # User Michael Pavone # Date 1589094960 25200 # Node ID 0d5f88e53dca5aac531bb2a251520fbf5d197f86 # Parent a7b753e260a251210510c2654e9614bb7dd7585e Fix merge error diff -r a7b753e260a2 -r 0d5f88e53dca genesis.c --- a/genesis.c Sat May 09 23:39:44 2020 -0700 +++ b/genesis.c Sun May 10 00:16:00 2020 -0700 @@ -476,7 +476,7 @@ #endif serialize_buffer state; init_serialize(&state); - genesis_serialize(gen, &state, address); + genesis_serialize(gen, &state, address, slot != EVENTLOG_SLOT); if (slot == SERIALIZE_SLOT) { gen->serialize_tmp = state.data; gen->serialize_size = state.size;