From d0245c85c0ba0936da1b4ec2f90dbc13234138c6 Mon Sep 17 00:00:00 2001 From: Gregory Burd Date: Fri, 22 Jun 2012 10:53:04 +0100 Subject: [PATCH] Oops, I left a merge in. --- src/hanoidb_writer.erl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/hanoidb_writer.erl b/src/hanoidb_writer.erl index a9ce4da..5c38ec0 100644 --- a/src/hanoidb_writer.erl +++ b/src/hanoidb_writer.erl @@ -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,