anchor.diff:  remove_write_block(Manifest, Chunk) ->
       Remaining = Manifest#lfs_manifest_v2.write_blocks_remaining,
       Updated = ordsets:del_element(Chunk, Remaining),
  +<<<<<<< HEAD
       ManiState = case Updated of
           [] ->
               active;
  
positive.code:     Manifest#lfs_manifest_v2{write_blocks_remaining=Updated,
                               state=ManiState,
                               last_block_written_time=erlang:now()}.
  
  sorted_blocks_remaining(#lfs_manifest_v2{write_blocks_remaining=Remaining}) ->
      lists:sort(sets:to_list(Remaining)).
  
negative.code:             BlockSize
      end.
  
  <<<<<<< HEAD
  %% @doc Return the configured block size
  -spec max_content_len() -> pos_integer().
  max_content_len() ->
  