Commit 422fbf85 authored by Maxime Lefrançois's avatar Maxime Lefrançois
Browse files

Merge branch 'issue-19' into 'master' 

Removing the conflicting axiom.

See merge request SAREF/saref-core!21
parents f0358d62 4af1b962

ontology/saref.ttl

+0 −8
Original line number Diff line number Diff line
@@ -372,14 +372,6 @@ saref:Device rdf:type owl:Class ; 
                               owl:onProperty saref:hasState ;

                               owl:allValuesFrom saref:State

                             ] ,

                             [ rdf:type owl:Restriction ;

                               owl:onProperty saref:hasTypicalConsumption ;

                               owl:allValuesFrom [ rdf:type owl:Class ;

                                                   owl:unionOf ( saref:Energy

                                                                 saref:Power

                                                               )

                                                 ]

                             ] ,

                             [ rdf:type owl:Restriction ;

                               owl:onProperty saref:isUsedFor ;

                               owl:allValuesFrom saref:Commodity