Resolved merge conflicts

2020-03-04 11:05:47 +00:00
parent b984376f15
commit c8602c8eb7
4 changed files with 12 additions and 2491 deletions
@@ -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>