Skip to content
Snippets Groups Projects
Commit d27c422c authored by Rainer Kartmann's avatar Rainer Kartmann
Browse files

Merge branch 'armem/dev' into armem/resolve-memory-link-in-gui

parents 57192b4d 22b6db87
No related branches found
No related tags found
2 merge requests!171Periodic merge of armem/dev into master,!170ArMem Viewer: Resolve Memory IDs
Hide whitespace changes
Inline Side-by-side
source/RobotAPI/libraries/aron/core/test/xmls/OptionalTest.xml
+ 2
− 2
View file @ d27c422c
......@@ -15,7 +15,7 @@
<Float optional="1"/>
</ObjectChild>
<ObjectChild key='some_string'>
<!--<ObjectChild key='some_string'>
<String optional="true"/>
</ObjectChild>
......@@ -57,7 +57,7 @@
<Float optional="ja" />
</List>
</List>
</ObjectChild>
</ObjectChild>-->
......
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