Commit 99cdfdae authored by Cornelis Bouter's avatar Cornelis Bouter
Browse files

solve merge conflict

parents b14b38be 1849b29d
Loading
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@prefix : <https://saref.etsi.org/saref4ener/v2.1.1/example/PowerEnvelopeProfile/>  .
@prefix s4ener: <https://saref.etsi.org/saref4tsrs/> .
@prefix owl: <http://www.w3.org/2002/07/owl#> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .