Conflicts in sto.ttl (master)

i40-Tools / I40KG

Contains the development for the Industry 4.0 standards knowledge graph (I40KG). Its current collaborative development is driven by VoCol - http://vocol.iais.fraunhofer.de/sto/

64 stars 24 forks source link

Conflicts in sto.ttl (master) #46

Closed sebbader closed 5 years ago

sebbader commented 5 years ago

There are two (minor) conflicts in the master branch: https://github.com/i40-Tools/StandardOntology/blob/4218e3304be0aa9d6276bca76137a73820b36aa4/sto.ttl#L2465 https://github.com/i40-Tools/StandardOntology/blob/4218e3304be0aa9d6276bca76137a73820b36aa4/sto.ttl#L3601

igrangel commented 5 years ago

They should be solved here.