Skip to content
Commit 1ee8b1bd authored by Maxime Lefrançois's avatar Maxime Lefrançois
Browse files

Merge branch 'issue-20' into 'master' 

Removed the conflicting axiom.

Closes #20

See merge request SAREF/saref-core!23
parents a0dcc7a7 40f87f0b
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment