Merge branch 'develop' of https://gitea.heisig-gmbh.de/Heisig_GmbH/infineon_plc into develop
# Conflicts: # PLC/01_Stationen/Kuka_Robot/ST_KukaRobot_JobParams.TcDUT
This commit is contained in:
@@ -326,6 +326,11 @@
|
||||
<SubType>Content</SubType>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PlaceholderResolution Include="BaseComponents">
|
||||
<Resolution>BaseComponents, * (Heisig GmbH)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
</ItemGroup>
|
||||
<ProjectExtensions>
|
||||
<PlcProjectOptions>
|
||||
<XmlArchive>
|
||||
|
||||
Reference in New Issue
Block a user