Code

Remove stray merge conflict markers#2493

Code

Merged

WardF merged 5 commits intoUnidata:mainUnidata/netcdf-c:mainfrom WardF:gh2492.wifWardF/netcdf-c:gh2492.wifCopy head branch name to clipboardAug 30, 2022

+2,135-1,014

Commits

Commits on Aug 28, 2022

• Add support for Zarr string type to NCZarr

  Show description for 231ae96
  DennisHeimbigner

  committed
  231ae96

  Copy full SHA for 231ae96

• Update release notes"

  DennisHeimbigner

  committed
  c9205ae

  Copy full SHA for c9205ae

• Fix LGTM alert: too few args

  DennisHeimbigner

  committed
  d0aff6a

  Copy full SHA for d0aff6a

Commits on Aug 29, 2022

• Update nczarr documentation

  DennisHeimbigner

  committed
  f4e181b

  Copy full SHA for f4e181b

Commits on Aug 30, 2022

• Remove stray conflict markers that made their way into the branch.

  WardF

  committed
  fae0f1f

  Copy full SHA for fae0f1f