Skip to content
Snippets Groups Projects
Commit 9c34dff1 authored by Andreas Kraft's avatar Andreas Kraft
Browse files

Merge branch 'RDM-2020-0025-SDT_4_0_-_Removing_optional_from_ModuleClass' into... 

Merge branch 'RDM-2020-0025-SDT_4_0_-_Removing_optional_from_ModuleClass' into WI-0081-Smart_Device_Template_4_0

# Conflicts:
#	SDT/schema4.0/docs/SDT_UML.uxf
#	SDT/schema4.0/docs/images/MC.Action.DataPoint.Event.png
#	SDT/schema4.0/docs/images/ModuleClass.png
#	SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png
#	SDT/schema4.0/docs/images/SDT_simplified.png
parents f11bca5d a0468f39
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 149 additions and 157 deletions
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