Commit bbd1fc8d authored by Cornelis Bouter's avatar Cornelis Bouter
Browse files

repair merge conflict

parents 7a6ca086 9acffc0f
Loading
Loading
Loading
Loading

examples/.gitkeep

0 → 100644
+0 −0

Empty file added.

+1 −1
Original line number Diff line number Diff line
<<<<<<< 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#> .
@@ -188,5 +189,4 @@ ex:Time_PowerProfile-1-HS0001
  rdfs:label "Time Power profile-1-HS0001"^^xsd:string ;
  saref:consistsOf ex:DateTimeInterval_PowerProfile-1-HS0001 ;
.

dcterms:abstract a owl:AnnotationProperty .
 No newline at end of file
+1 −0
Original line number Diff line number Diff line
@@ -232,4 +232,5 @@ dcterms:abstract a owl:AnnotationProperty .
saref:hasIdentifier a owl:DatatypeProperty .
time:hasBeginning a owl:DatatypeProperty .
time:hasEnd a owl:DatatypeProperty .
0db38bea6882a76096dc6
time:Interval a owl:Class .
 No newline at end of file
+1 −1

File changed.

Contains only whitespace changes.

+1 −1

File changed.

Contains only whitespace changes.

+1 −1

File changed.

Contains only whitespace changes.

Loading