fixing merge conflict

brain-bican · Nov 1, 2023 · 307e44f · 307e44f
2 parents 5c26a4d + 961638a
commit 307e44f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/json-schema-autogen/kbmodel.json b/json-schema-autogen/kbmodel.json
@@ -14462,7 +14462,11 @@
         },
         "GeneAffectsChemicalAssociation": {
             "additionalProperties": false,
+<<<<<<< HEAD
             "description": "Describes an effect that a gene or gene product has on a chemical entity (e.g. an impact of on its abundance, activity, localization, processing, transport, etc.)",
+=======
+            "description": "Describes an effect that a gene or gene product has on a chemical entity (e.g. an impact of on its abundance, activity,localization, processing, expression, etc.)",
+>>>>>>> upstream/main
             "properties": {
                 "aggregator_knowledge_source": {
                     "description": "An intermediate aggregator resource from which knowledge expressed in an Association was retrieved downstream of the original source, on its path to its current serialized form.",
@@ -14477,9 +14481,12 @@
                 },
                 "category": {
                     "description": "Name of the high level ontology class in which this entity is categorized. Corresponds to the label for the biolink entity type class.\n * In a neo4j database this MAY correspond to the neo4j label tag.\n * In an RDF database it should be a biolink model class URI.\nThis field is multi-valued. It should include values for ancestors of the biolink class; for example, a protein such as Shh would have category values `biolink:Protein`, `biolink:GeneProduct`, `biolink:MolecularEntity`, ...\nIn an RDF database, nodes will typically have an rdf:type triples. This can be to the most specific biolink class, or potentially to a class more specific than something in biolink. For example, a sequence feature `f` may have a rdf:type assertion to a SO class such as TF_binding_site, which is more specific than anything in biolink. Here we would have categories {biolink:GenomicEntity, biolink:MolecularEntity, biolink:NamedThing}",
+<<<<<<< HEAD
                     "enum": [
                         "biolink:GeneAffectsChemicalAssociation"
                     ],
+=======
+>>>>>>> upstream/main
                     "items": {
                         "type": "string"
                     },