berti_r/Motion_test
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflict while merging to integration branch

Browse Source
This commit is contained in:
Federico Rojas
2019-08-08 11:32:13 +02:00
parent 3afaa99adc f0df405a7a
commit 232a454e21
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
solution/solution.tsproj
View File

@@ -1172,4 +1172,7 @@ External Setpoint Generation:
</Project>
</Plc>
</Project>
<Mappings>
<MappingInfo Identifier="{05000010-2041-0850-3000-040340205008}" Id="#x02030010" Watchdog="04000000080000000400000004000000"/>
</Mappings>
</TcSmProject>