Skip to content

Fix/resolve pr 870 conflict #871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shanmukhkalasamudram wants to merge 9 commits into
base: develop
Choose a base branch
from
+4 −4
Open

Fix/resolve pr 870 conflict #871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7db5d0b
Merge pull request #536 from CommonCoreOntology/develop
Nov 4, 2024
fb55cba
Merge pull request #538 from CommonCoreOntology/develop
Nov 4, 2024
bb19a22
Merge branch 'develop'
Nov 8, 2024
8e9e553
Merge branch 'develop'
Nov 8, 2024
5d506a5
2.1 Release PR (#851)
johnbeve Apr 4, 2026
b11e972
Revert "2.1 Release PR (#851)"
johnbeve Apr 4, 2026
c0faab5
Merge remote-tracking branch 'origin/develop'
johnbeve Apr 4, 2026
25cc29d
update release version
johnbeve Apr 5, 2026
53c2bb8
Resolve merge conflict with master: keep develop version of CommonCor…
May 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/cco-modules/TimeOntology.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
@base <https://www.commoncoreontologies.org/TimeOntology> .

<https://www.commoncoreontologies.org/TimeOntology> rdf:type owl:Ontology ;
owl:versionIRI <https://www.commoncoreontologies.org/2024-11-06/TimeOntology> ;
owl:versionIRI <https://www.commoncoreontologies.org/2026-04-04/TimeOntology> ;
owl:imports cco:ExtendedRelationOntology ;
dcterms:license "BSD 3-Clause: https://github.com/CommonCoreOntology/CommonCoreOntologies/blob/master/LICENSE"@en ;
dcterms:rights "CUBRC Inc., see full license."@en ;
rdfs:comment "This ontology is designed to represent temporal regions and the relations that hold between them."@en ;
rdfs:label "Time Ontology"@en ;
owl:versionInfo "Version 2.0"@en .
owl:versionInfo "Version 2.1"@en .

#################################################################
# Annotation properties
Expand Down
4 changes: 2 additions & 2 deletions src/cco-modules/UnitsOfMeasureOntology.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
@base <https://www.commoncoreontologies.org/UnitsOfMeasureOntology> .

<https://www.commoncoreontologies.org/UnitsOfMeasureOntology> rdf:type owl:Ontology ;
owl:versionIRI <https://www.commoncoreontologies.org/2024-11-06/UnitsOfMeasureOntology> ;
owl:versionIRI <https://www.commoncoreontologies.org/2026-04-04/UnitsOfMeasureOntology> ;
owl:imports <https://www.commoncoreontologies.org/InformationEntityOntology> ;
dcterms:license "BSD 3-Clause: https://github.com/CommonCoreOntology/CommonCoreOntologies/blob/master/LICENSE"@en ;
dcterms:rights "CUBRC Inc., see full license."@en ;
rdfs:comment "This ontology is designed to represent standard measurement units that are used when measuring various attributes of entities."@en ;
rdfs:label "Units of Measure Ontology"@en ;
owl:versionInfo "Version 2.0"@en .
owl:versionInfo "Version 2.1"@en .

#################################################################
# Annotation properties
Expand Down