Skip to content
Snippets Groups Projects
Commit cde938b9 authored by Shan Lin's avatar Shan Lin
Browse files

Merge branch 'feat-new-examples' of https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si... 

Merge branch 'feat-new-examples' of https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si into feat-new-examples

# Conflicts:
#	examples/IMPROVABLE/PTB-IMPROVABLE-examples.xml
#	examples/PLATINUM/PTB-PLATINUM-examples.xml
parents 1ac623ca b4048991
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 41 additions and 36 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment