Missed merge changing namespace from open-services

to OMG.
oslc-op · Jan 4, 2025 · 7fe7efb · 7fe7efb
1 parent c0cd115
commit 7fe7efb
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/specs/sysml/SysML-Vocabulary-vocab.ttl b/specs/sysml/SysML-Vocabulary-vocab.ttl
@@ -1,10 +1,6 @@
 @prefix dcterms: <http://purl.org/dc/terms/> .
 @prefix oslc_am: <http://open-services.net/ns/am#> .
-<<<<<<<< HEAD:specs/sysml/SysML-Vocabulary-vocab.ttl
 @prefix oslc_sysml: <https://www.omg.org/spec/sysml/vocabulary#> .
-========
-@prefix oslc_sysml: <http://open-services.net/ns/sysml#> .
->>>>>>>> master:specs/sysml/sysml-vocab.ttl
 @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#> .