Merge develop into release/15.0.0 (replaces #1452)#1453
Closed
stevenchalem wants to merge 190 commits into
Closed
Conversation
Co-authored-by: Rebecca Younes <rebecca.younes@semanticarts.com>
This reverts commit 2797780.
…nticarts/gist into 898-handle-default-prefixes
don't bundle Contributing.md Co-authored-by: Rebecca Younes <rebecca.younes@semanticarts.com>
Fix code block formatting
Merge Release/14.0.0 into Main
Merge `issue-1327-fix-readme` into `main`
Updated the definition of gist:Specification to clarify conformance requirements.
Co-authored-by: Rebecca Younes <rebecca.younes@semanticarts.com>
…EADME Expand README.md
Merge Release/14.1.0 into main
# Conflicts: # ontologies/gistCore.ttl
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Replaces #1452 — same goal (merge
developintorelease/15.0.0), but with the two merge conflicts pre-resolved on this intermediate branch so the reviewer can merge cleanly.Conflict resolutions in
ontologies/gistCore.ttl:gist:Determination— keptrdfs:subClassOf gist:Taskper release note Determination should be a subclass of Task #1260, took "sulfur" spelling from develop.gist:containedText— keptrdfs:range rdf:PlainLiteralper release note Range on datatype properties - consider union of xsd:string and rdf:langString #1302, took develop's refinedskos:definition.Once merged, #1452 can be closed.