Skip to content

GitLab

Commit bbb56b80 authored by ankraft's avatar ankraft
Browse files

Merge branch 'RDM-2019-0011-SDT_4_0_-_Moving_Product_under_Domain' into... 

Merge branch 'RDM-2019-0011-SDT_4_0_-_Moving_Product_under_Domain' into WI-0081-Smart_Device_Template_4_0

# Conflicts:
#	SDT/schema4.0/docs/SDT_UML.uxf
#	SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png
parents b0de2ce3 3519a9b8
Expand all Show whitespace changes
Inline Side-by-side
Showing with 229 additions and 221 deletions
SDT/schema4.0/docs/SDT_UML.uxf
View file @ bbb56b80
This diff is collapsed.
Markdown is supported
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