.gitignore

@@ -2,4 +2,5 @@
 .DS_Store
 catalog-v001.xml
 saref-pipeline.jar
-target
\ No newline at end of file
+target
+ts
\ No newline at end of file

.saref-repositories.yml

 labs.etsi.org/rep/:
   repos:
     - saref/saref-core
+    - saref/saref4syst

examples/heatingSystemPowerProfile.ttl

-<<<<<<< HEAD
 @prefix ex: <https://saref.etsi.org/saref4ener/v1.2.1/example/heatingSystemPowerProfile/> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .

ontology/saref4ener.ttl

@@ -74,6 +74,9 @@ The additional key aspect captured in the ic-flex module is that a flex offer ca
   owl:imports <https://saref.etsi.org/core/v3.1.1/> ;
   owl:versionIRI <https://saref.etsi.org/saref4ener/v1.2.1/> ;
   owl:versionInfo "v1.2.1" ;
+  owl:priorVersion <https://saref.etsi.org/saref4ener/v1.1.2/> ;
+  dcterms:issued "2024-04-25"^^xsd:date ;
+  rdfs:seeAlso <https://www.etsi.org/deliver/etsi_ts/103400_103499/10341001/01.02.01_60/ts_10341001v010201p.pdf> ;
 .
 s4ener:Aborted
   a owl:NamedIndividual ;