Skip to content

Commit

Permalink
fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
sierra-moxon committed Jul 26, 2024
2 parents cc21815 + 2a0a44c commit 9db90fd
Show file tree
Hide file tree
Showing 8 changed files with 21,488 additions and 21,494 deletions.
2 changes: 0 additions & 2 deletions biolink-model.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7054,8 +7054,6 @@ classes:
- STY:T075
# Drug Delivery Device
- STY:T203
# Biomedical or Dental Material
- STY:T122

diagnostic aid:
is_a: named thing
Expand Down
2 changes: 1 addition & 1 deletion project/jsonld/biolink_model.context.jsonld
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"comments": {
"description": "Auto generated by LinkML jsonld context generator",
"generation_date": "2024-07-25T17:45:05",
"generation_date": "2024-07-25T17:51:03",
"source": "biolink_model.yaml"
},
"@context": {
Expand Down
9 changes: 4 additions & 5 deletions project/jsonld/biolink_model.jsonld
Original file line number Diff line number Diff line change
Expand Up @@ -24526,8 +24526,7 @@
"UMLSSG:DEVI",
"STY:T074",
"STY:T075",
"STY:T203",
"STY:T122"
"STY:T203"
],
"is_a": "NamedThing",
"slots": [
Expand Down Expand Up @@ -35037,9 +35036,9 @@
],
"metamodel_version": "1.7.0",
"source_file": "biolink_model.yaml",
"source_file_date": "2024-07-25T17:45:00",
"source_file_size": 393015,
"generation_date": "2024-07-25T17:45:06",
"source_file_date": "2024-07-25T17:50:59",
"source_file_size": 392960,
"generation_date": "2024-07-25T17:51:05",
"@type": "SchemaDefinition",
"@context": [
"project/jsonld/biolink_model.context.jsonld",
Expand Down
5,589 changes: 2,794 additions & 2,795 deletions project/owl/biolink_model.owl.ttl

Large diffs are not rendered by default.

37,374 changes: 18,687 additions & 18,687 deletions project/shacl/biolink_model.shacl.ttl

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/biolink_model/datamodel/model.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Auto generated from biolink_model.yaml by pythongen.py version: 0.0.1
# Generation date: 2024-07-25T17:45:18
# Generation date: 2024-07-25T17:51:17
# Schema: Biolink-Model
#
# id: https://w3id.org/biolink/biolink-model
Expand Down
2 changes: 0 additions & 2 deletions src/biolink_model/schema/biolink_model.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7054,8 +7054,6 @@ classes:
- STY:T075
# Drug Delivery Device
- STY:T203
# Biomedical or Dental Material
- STY:T122

diagnostic aid:
is_a: named thing
Expand Down
2 changes: 1 addition & 1 deletion src/biolink_model/scripts/classprefixes.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Auto generated from class_prefixes.yaml by pythongen.py version: 0.0.1
# Generation date: 2024-07-25T17:46:11
# Generation date: 2024-07-25T17:52:08
# Schema: BiolinkClassPrefixes
#
# id: biolink-model-class-prefixes
Expand Down

0 comments on commit 9db90fd

Please sign in to comment.