Fix merge conflicts master develop

adiwg / mdJson-schemas

JSON schemas, examples, and templates for ADIwg metadata standards

http://www.adiwg.org/projects/

GNU Lesser General Public License v3.0

18 stars 15 forks source link

Fix merge conflicts master develop #334

Closed jwaspin closed 1 month ago

jwaspin commented 1 month ago

Doing a merge commit with this PR into dev should resolve the merge conflicts. (squash commit and rebase commit don't work to resolve this issue as far as I know)

nunatech commented 1 month ago

I am off the grid while kayaking on Prince William Sound through June 7th. Thanks for your patience. -Allison Gaylord