clean up conflicts

linkml · Aug 5, 2024 · d2a9b92 · d2a9b92
1 parent 7835416
commit d2a9b92
Show file tree

Hide file tree

Showing 9 changed files with 304 additions and 723 deletions.
diff --git a/project/excel/cmdr.xlsx b/project/excel/cmdr.xlsx
diff --git a/project/graphql/cmdr.graphql b/project/graphql/cmdr.graphql
diff --git a/project/jsonld/cmdr.context.jsonld b/project/jsonld/cmdr.context.jsonld
@@ -1,11 +1,7 @@
 {
    "comments": {
       "description": "Auto generated by LinkML jsonld context generator",
-<<<<<<< HEAD
       "generation_date": "2023-03-07T15:54:05",
-=======
-      "generation_date": "2023-03-07T15:56:42",
->>>>>>> main
       "source": "cmdr.yaml"
    },
    "@context": {

diff --git a/project/jsonld/cmdr.jsonld b/project/jsonld/cmdr.jsonld
@@ -1273,11 +1273,7 @@
   "source_file": "cmdr.yaml",
   "source_file_date": "2023-03-06T16:01:53",
   "source_file_size": 485,
-<<<<<<< HEAD
   "generation_date": "2023-03-07T15:54:06",
-=======
-  "generation_date": "2023-03-07T15:56:42",
->>>>>>> main
   "@type": "SchemaDefinition",
   "@context": [
     "project/jsonld/cmdr.context.jsonld",

diff --git a/project/owl/cmdr.owl.ttl b/project/owl/cmdr.owl.ttl
diff --git a/project/prefixmap/cmdr.yaml b/project/prefixmap/cmdr.yaml
@@ -1,40 +1,16 @@
 {
-   "OBI": "http://purl.obolibrary.org/obo/OBI_",
+   "OBI": "http://example.org/UNKNOWN/OBI/",
    "PATO": "http://purl.obolibrary.org/obo/PATO_",
-   "TEMP": "https://example.org/TEMP/",
    "biolink": "https://w3id.org/biolink/",
    "cmdr": "https://w3id.org/linkml/cmdr/",
    "example": "https://example.org/",
    "linkml": "https://w3id.org/linkml/",
    "schema": "http://schema.org/",
-   "Container": {
-      "@id": "TEMP:Container"
-   },
-   "DataObject": {
-      "@id": "TEMP:DataObject"
-   },
-   "Investigation": {
-      "@id": "TEMP:Investigation"
-   },
-   "MaterialEntity": {
-      "@id": "TEMP:MaterialEntity"
-   },
    "MaterialProcessing": {
       "@id": "OBI:0000094"
    },
-   "Participation": {
-      "@id": "TEMP:Participation"
-   },
-   "Process": {
-      "@id": "TEMP:Process"
-   },
-   "Quantity": {
-      "@id": "TEMP:Quantity"
-   },
    "SpecimenCollectionProcess": {
       "@id": "OBI:0000659"
-   },
-   "Subject": {
-      "@id": "TEMP:Subject"
    }
 }
+