Resolved merge conflicts
This commit is contained in:
1 parent
b984376f15
commit
c8602c8eb7
4 files changed
+12
-2491
No files matched your search
File diff suppressed because it is too large.
Load diff
@@ -16,6 +16,5 @@
|
||||
<SvbTask Priority="8" CycleTime="100000" AmsPort="511">
|
||||
<Name>NC-Task 1 SVB</Name>
|
||||
</SvbTask>
|
||||
<Axis File="tcUNIT_simulated_axis.xti" Id="1"/>
|
||||
</NC>
|
||||
</TcSmItem>
|
||||
Reference in new issue
Block a user