Resolve merge conflicts to master

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

Closed jwaspin closed 5 months ago

jwaspin commented 5 months ago

Fixing merge conflicts (no associated issues)

Hopefully this works - no files changed. Conflict was with package-lock.json