Merge pull request #110 from berkeleybop/config-fix

Fix for merge conflict scars in aio-odk.yaml
berkeleybop · Aug 12, 2024 · 2f2a7bb · 2f2a7bb
2 parents 7c3e175 + 73a9de0
commit 2f2a7bb
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/ontology/aio-odk.yaml b/src/ontology/aio-odk.yaml
@@ -5,16 +5,13 @@ repo: artificial-intelligence-ontology
 use_mappings: true
 import_group:
   products:
-<<<<<<< HEAD
     - id: swo
 sssom_mappingset_group:
   products:
     - id: aio-to-mlo
       maintenance: manual
 namespaces:
   - https://w3id.org/aio/
-=======
->>>>>>> origin/main
 report_fail_on: none
 release_artefacts:
   - base