anchor.diff:              BlockSize
       end.
   
  +<<<<<<< HEAD
   %% @doc Return the configured block size
   -spec max_content_len() -> pos_integer().
   max_content_len() ->
  
positive.code: remove_write_block(Manifest, Chunk) ->
      Remaining = Manifest#lfs_manifest_v2.write_blocks_remaining,
      Updated = ordsets:del_element(Chunk, Remaining),
      ManiState = case Updated of
          [] ->
              active;
  
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 ->
  