anchor.diff:              BlockSize
       end.
   
  +<<<<<<< HEAD
   %% @doc Return the configured block size
   -spec max_content_len() -> pos_integer().
   max_content_len() ->
  
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:             MaxContentLen
      end.
  
  =======
  >>>>>>> Remove getter/setter funcs from riak_moss_lfs_utils
  safe_block_size_from_manifest(#lfs_manifest_v2{block_size=BlockSize}) ->
      case BlockSize of
          undefined ->
  