Skip to content

Commit

Permalink
Merge branch 'dev' of github.com:Exabyte-io/exabyte-materials-json in…
Browse files Browse the repository at this point in the history
…to update/SOF-6182
  • Loading branch information
k0stik committed Oct 21, 2022
2 parents 9745f43 + 94d38c3 commit 3897a74
Show file tree
Hide file tree
Showing 8 changed files with 4 additions and 5 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion schema/properties/best.json → schema/property/best.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"schemaId": "properties/best",
"schemaId": "property/best",
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Schema of material's best properties",
"allOf": [
Expand Down
2 changes: 1 addition & 1 deletion schema/properties/raw.json → schema/property/raw.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"schemaId": "properties/raw",
"schemaId": "property/raw",
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Schema of material's preliminary property",
"allOf": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"schemaId": "properties/refined",
"schemaId": "property/refined",
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Schema of material's property",
"allOf": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"schemaId": "properties/source",
"schemaId": "property/source",
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "The source of a property. This could be an article, a simulation on Exabyte, an external simulation, etc.",
"type": "object",
Expand Down
1 change: 0 additions & 1 deletion schema/workflow.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"type": "object",
"allOf": [
{
"description": "in-memory entity",
"$ref": "in_memory_entity/named_defaultable_has_metadata.json"
}
],
Expand Down

0 comments on commit 3897a74

Please sign in to comment.