Revert "Merge remote-tracking branch 'origin/main'"

This reverts commit 762e15a, reversing
changes made to 029df62.

Author: thnlrd

CONTRIBUTING.md

@@ -24,11 +24,7 @@ changes to this document in a pull request.
 
 ### Reporting problems with the ontology
 
-<<<<<<< HEAD
-Please use our [Issue Tracker](https://github.com/materialdigital/app-ontology-template/issues/) for reporting problems with the ontology. 
-=======
 Please use our [Issue Tracker](https://github.com/materialdigital/heat-treatment-application-ontology/issues/) for reporting problems with the ontology. 
->>>>>>> origin/main
 To learn how to write a good issue [see here](#great-issues).
 
 <a id="requesting-terms"></a>
@@ -52,17 +48,10 @@ community resource, it is often necessary to do at least some of the work of add
 
 #### How to write a new term request
 
-<<<<<<< HEAD
-Request a new term _via_ the GitHub [Issue Tracker](https://github.com/materialdigital/app-ontology-template/issues/).
-
-It is important to remember that it takes a lot of time for curators to process issues submitted to the tracker.
-To make this work easier, please always use issue templates if they are available (https://github.com/materialdigital/app-ontology-template/issues/new/choose).
-=======
 Request a new term _via_ the GitHub [Issue Tracker](https://github.com/materialdigital/heat-treatment-application-ontology/issues/).
 
 It is important to remember that it takes a lot of time for curators to process issues submitted to the tracker.
 To make this work easier, please always use issue templates if they are available (https://github.com/materialdigital/heat-treatment-application-ontology/issues/new/choose).
->>>>>>> origin/main
 
 For how to write a good term request, please read the [best practices carefully](#great-issues).
 

README.md

@@ -1,9 +1,5 @@
 
-<<<<<<< HEAD
-![Build Status](https://github.com/materialdigital/app-ontology-template/actions/workflows/qc.yml/badge.svg)
-=======
 ![Build Status](https://github.com/materialdigital/heat-treatment-application-ontology/actions/workflows/qc.yml/badge.svg)
->>>>>>> origin/main
 # My Application Ontology
 
 Description: None
@@ -26,16 +22,8 @@ Editors of this ontology should use the edit version, [src/ontology/hto-edit.owl
 
 ## Contact
 
-<<<<<<< HEAD
-Please use this GitHub repository's [Issue tracker](https://github.com/materialdigital/app-ontology-template/issues) to request new terms/classes or report errors or specific concerns related to the ontology.
-
-## Acknowledgements
-
-This ontology repository was created using the [Ontology Development Kit (ODK)](https://github.com/INCATools/ontology-development-kit).
-=======
 Please use this GitHub repository's [Issue tracker](https://github.com/materialdigital/heat-treatment-application-ontology/issues) to request new terms/classes or report errors or specific concerns related to the ontology.
 
 ## Acknowledgements
 
 This ontology repository was created using the [Ontology Development Kit (ODK)](https://github.com/INCATools/ontology-development-kit).
->>>>>>> origin/main

hto.ttl

@@ -2,13 +2,8 @@ id: hto
 title: "My Application Ontology"
 github_org: materialdigital
 git_main_branch: main
-<<<<<<< HEAD
-repo: app-ontology-template
-uribase: https://w3id.org/pmd/ao
-=======
 repo: heat-treatment-application-ontology
 uribase: https://w3id.org/pmd/ao/hto
->>>>>>> origin/main
 uribase_suffix: hto
 
 release_artefacts:

seed-template.yaml

@@ -3,17 +3,10 @@ layout: ontology_detail
 id: hto
 title: My Application Ontology
 jobs:
-<<<<<<< HEAD
-  - id: https://travis-ci.org/materialdigital/app-ontology-template
-    type: travis-ci
-build:
-  checkout: git clone https://github.com/materialdigital/app-ontology-template.git
-=======
   - id: https://travis-ci.org/materialdigital/heat-treatment-application-ontology
     type: travis-ci
 build:
   checkout: git clone https://github.com/materialdigital/heat-treatment-application-ontology.git
->>>>>>> origin/main
   system: git
   path: "."
 contact:
@@ -22,11 +15,7 @@ contact:
   github: 
 description: My Application Ontology is an ontology...
 domain: stuff
-<<<<<<< HEAD
-homepage: https://github.com/materialdigital/app-ontology-template
-=======
 homepage: https://github.com/materialdigital/heat-treatment-application-ontology
->>>>>>> origin/main
 products:
   - id: hto.owl
     name: "My Application Ontology main release in OWL format"
@@ -42,11 +31,7 @@ products:
     name: "My Application Ontology additional release in OBOJSon format"
 dependencies:
 - id: pmdco
-<<<<<<< HEAD
-tracker: https://github.com/materialdigital/app-ontology-template/issues
-=======
 tracker: https://github.com/materialdigital/heat-treatment-application-ontology/issues
->>>>>>> origin/main
 license:
   url: http://creativecommons.org/licenses/by/3.0/
   label: CC-BY

src/metadata/hto.md

@@ -4,13 +4,8 @@ idspace: HTO
 base_url: /obo/hto
 
 products:
-<<<<<<< HEAD
-- hto.owl: https://raw.githubusercontent.com/materialdigital/app-ontology-template/main/hto.owl
-- hto.obo: https://raw.githubusercontent.com/materialdigital/app-ontology-template/main/hto.obo
-=======
 - hto.owl: https://raw.githubusercontent.com/materialdigital/heat-treatment-application-ontology/main/hto.owl
 - hto.obo: https://raw.githubusercontent.com/materialdigital/heat-treatment-application-ontology/main/hto.obo
->>>>>>> origin/main
 
 term_browser: ontobee
 example_terms:
@@ -19,26 +14,15 @@ example_terms:
 entries:
 
 - prefix: /releases/
-<<<<<<< HEAD
-  replacement: https://raw.githubusercontent.com/materialdigital/app-ontology-template/v
-
-- prefix: /tracker/
-  replacement: https://github.com/materialdigital/app-ontology-template/issues
-=======
   replacement: https://raw.githubusercontent.com/materialdigital/heat-treatment-application-ontology/v
 
 - prefix: /tracker/
   replacement: https://github.com/materialdigital/heat-treatment-application-ontology/issues
->>>>>>> origin/main
 
 - prefix: /about/
   replacement: http://www.ontobee.org/ontology/HTO?iri=http://purl.obolibrary.org/obo/
 
 ## generic fall-through, serve direct from github by default
 - prefix: /
-<<<<<<< HEAD
-  replacement: https://raw.githubusercontent.com/materialdigital/app-ontology-template/main/
-=======
   replacement: https://raw.githubusercontent.com/materialdigital/heat-treatment-application-ontology/main/
->>>>>>> origin/main
 

src/metadata/hto.yml

@@ -10,11 +10,7 @@
 # More information: https://github.com/INCATools/ontology-development-kit/
 
 # Fingerprint of the configuration file when this Makefile was last generated
-<<<<<<< HEAD
-CONFIG_HASH=                22865d9e229bf630f54801adb92de6f10b3ed55a7be7d55ac54227282063279a
-=======
 CONFIG_HASH=                97a54284947fba74d2847c3867294c472a3c1be4e844c9e619b921ec32cee855
->>>>>>> origin/main
 
 
 # ----------------------------------------
@@ -421,8 +417,6 @@ $(IMPORTDIR)/%_import.owl: $(MIRRORDIR)/%.owl $(IMPORTDIR)/%_terms.txt \
 
 .PRECIOUS: $(IMPORTDIR)/%_import.owl
 
-<<<<<<< HEAD
-=======
 ## Module for ontology: pmdco (mirror)
 $(IMPORTDIR)/pmdco_import.owl: $(MIRRORDIR)/pmdco.owl | all_robot_plugins
 	$(ROBOT) annotate --input $< --remove-annotations \
@@ -432,7 +426,6 @@ $(IMPORTDIR)/pmdco_import.owl: $(MIRRORDIR)/pmdco.owl | all_robot_plugins
 		 repair --merge-axiom-annotations true \
 		 $(ANNOTATE_CONVERT_FILE)
 
->>>>>>> origin/main
 endif # IMP=true
 
 .PHONY: refresh-imports
@@ -470,11 +463,7 @@ ifeq ($(MIR),true)
 .PHONY: mirror-pmdco
 .PRECIOUS: $(MIRRORDIR)/pmdco.owl
 mirror-pmdco: | $(TMPDIR)
-<<<<<<< HEAD
-	$(ROBOT) convert -I https://w3id.org/pmd/co -o $(TMPDIR)/$@.owl
-=======
 	$(ROBOT) convert -I https://materialdigital.github.io/core-ontology/ontology.owl -o $(TMPDIR)/$@.owl
->>>>>>> origin/main
 
 
 $(MIRRORDIR)/%.owl: mirror-% | $(MIRRORDIR)

src/ontology/Makefile

@@ -9,16 +9,6 @@
      xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
      xmlns:dcterms="http://purl.org/dc/terms/">
     <owl:Ontology rdf:about="https://w3id.org/pmd/ao/hto/hto-base.owl">
-<<<<<<< HEAD
-        <owl:versionIRI rdf:resource="https://w3id.org/pmd/ao/hto/releases/2025-08-28/hto-base.owl"/>
-        <dce:type rdf:resource="http://purl.obolibrary.org/obo/IAO_8000001"/>
-        <dcterms:contributor rdf:resource="https://orcid.org/0000-0003-1649-6832"/>
-        <dcterms:creator rdf:resource="https://orcid.org/0000-0002-9014-2920"/>
-        <dcterms:description>A platform material digital application ontology for heat treatments</dcterms:description>
-        <dcterms:license rdf:resource="https://creativecommons.org/licenses/unspecified"/>
-        <dcterms:title xml:lang="en">Platform Material Digital Application Ontology (PMDao) - Heat Treatment Module</dcterms:title>
-        <owl:versionInfo>2025-08-28</owl:versionInfo>
-=======
         <owl:versionIRI rdf:resource="https://w3id.org/pmd/ao/hto/releases/2025-08-29/hto-base.owl"/>
         <dce:type rdf:resource="http://purl.obolibrary.org/obo/IAO_8000001"/>
         <dcterms:contributer rdf:resource="https://orcid.org/0000-0003-1649-6832"/>
@@ -27,7 +17,6 @@
         <dcterms:license rdf:resource="https://creativecommons.org/licenses/unspecified"/>
         <dcterms:title xml:lang="en">Platform Material Digital Application Ontology (PMDao) - Heat Treatment Module</dcterms:title>
         <owl:versionInfo>2025-08-29</owl:versionInfo>
->>>>>>> origin/main
     </owl:Ontology>
 
 
@@ -49,15 +38,9 @@
 
 
 
-<<<<<<< HEAD
-    <!-- http://purl.org/dc/terms/contributor -->
-
-    <owl:AnnotationProperty rdf:about="http://purl.org/dc/terms/contributor"/>
-=======
     <!-- http://purl.org/dc/terms/contributer -->
 
     <owl:AnnotationProperty rdf:about="http://purl.org/dc/terms/contributer"/>
->>>>>>> origin/main
 
 
 

src/ontology/hto-base.owl

@@ -9,16 +9,6 @@
 @base <https://w3id.org/pmd/ao/hto/hto-base.ttl> .
 
 <https://w3id.org/pmd/ao/hto/hto-base.ttl> rdf:type owl:Ontology ;
-<<<<<<< HEAD
-                                            owl:versionIRI <https://w3id.org/pmd/ao/hto/releases/2025-08-28/hto-base.ttl> ;
-                                            dce:type <http://purl.obolibrary.org/obo/IAO_8000001> ;
-                                            dcterms:contributor <https://orcid.org/0000-0003-1649-6832> ;
-                                            dcterms:creator <https://orcid.org/0000-0002-9014-2920> ;
-                                            dcterms:description "A platform material digital application ontology for heat treatments" ;
-                                            dcterms:license <https://creativecommons.org/licenses/unspecified> ;
-                                            dcterms:title "Platform Material Digital Application Ontology (PMDao) - Heat Treatment Module"@en ;
-                                            owl:versionInfo "2025-08-28" .
-=======
                                             owl:versionIRI <https://w3id.org/pmd/ao/hto/releases/2025-08-29/hto-base.ttl> ;
                                             dce:type <http://purl.obolibrary.org/obo/IAO_8000001> ;
                                             dcterms:contributer <https://orcid.org/0000-0003-1649-6832> ;
@@ -27,7 +17,6 @@
                                             dcterms:license <https://creativecommons.org/licenses/unspecified> ;
                                             dcterms:title "Platform Material Digital Application Ontology (PMDao) - Heat Treatment Module"@en ;
                                             owl:versionInfo "2025-08-29" .
->>>>>>> origin/main
 
 #################################################################
 #    Annotation properties
@@ -37,13 +26,8 @@
 dce:type rdf:type owl:AnnotationProperty .
 
 
-<<<<<<< HEAD
-###  http://purl.org/dc/terms/contributor
-dcterms:contributor rdf:type owl:AnnotationProperty .
-=======
 ###  http://purl.org/dc/terms/contributer
 dcterms:contributer rdf:type owl:AnnotationProperty .
->>>>>>> origin/main
 
 
 ###  http://purl.org/dc/terms/creator