Oops, I left a merge in.
This commit is contained in:
parent
9eabb78d06
commit
d0245c85c0
1 changed files with 0 additions and 4 deletions
|
@ -172,11 +172,7 @@ do_open(Name, Options, OpenOpts) ->
|
|||
%% @doc flush pending nodes and write trailer
|
||||
flush_nodes(#state{ nodes=[], last_node_pos=LastNodePos, last_node_size=_LastNodeSize, bloom=Bloom }=State) ->
|
||||
|
||||
<<<<<<< Updated upstream
|
||||
BloomBin = zlib:zip(term_to_binary(Bloom)),
|
||||
=======
|
||||
BloomBin = term_to_binary(Bloom, [compressed]),
|
||||
>>>>>>> Stashed changes
|
||||
BloomSize = byte_size(BloomBin),
|
||||
|
||||
IdxFile = State#state.index_file,
|
||||
|
|
Loading…
Reference in a new issue