push unsaved merges

Author: d-v-b

zarr/creation.py

@@ -22,11 +22,7 @@ def create(shape, chunks=True, dtype=None, compressor='default',
            overwrite=False, path=None, chunk_store=None, filters=None,
            cache_metadata=True, cache_attrs=True, read_only=False,
            object_codec=None, dimension_separator=None, write_empty_chunks=True,
-<<<<<<< HEAD
-           attrs: Dict[str, Any] = {}, *, zarr_version=None, meta_array=None, **kwargs):
-=======
            *, zarr_version=None, meta_array=None, storage_transformers=(), **kwargs):
->>>>>>> 385b5d3635618e086eb4752f81c652379751a5ad
     """Create an array.
 
     Parameters
@@ -184,11 +180,7 @@ def create(shape, chunks=True, dtype=None, compressor='default',
     init_array(store, shape=shape, chunks=chunks, dtype=dtype, compressor=compressor,
                fill_value=fill_value, order=order, overwrite=overwrite, path=path,
                chunk_store=chunk_store, filters=filters, object_codec=object_codec,
-<<<<<<< HEAD
-               dimension_separator=dimension_separator, attrs=attrs)
-=======
                dimension_separator=dimension_separator, storage_transformers=storage_transformers)
->>>>>>> 385b5d3635618e086eb4752f81c652379751a5ad
 
     # instantiate array
     z = Array(store, path=path, chunk_store=chunk_store, synchronizer=synchronizer,

zarr/storage.py

@@ -313,13 +313,8 @@ def init_array(
     chunk_store: Optional[StoreLike] = None,
     filters=None,
     object_codec=None,
-<<<<<<< HEAD
-    dimension_separator: Optional[str] = None,
-    attrs: Dict[str, Any] = {}
-=======
     dimension_separator=None,
     storage_transformers=(),
->>>>>>> 385b5d3635618e086eb4752f81c652379751a5ad
 ):
     """Initialize an array store with the given configuration. Note that this is a low-level
     function and there should be no need to call this directly from user code.