C2025-023 Bringing branch up to date to resolve merge conflicts
This commit is contained in:
@@ -288,6 +288,10 @@
|
||||
<Content Include="fmtall\NSPWGall.xml" />
|
||||
<Content Include="fmtall\NSP_00all.xml" />
|
||||
<Content Include="fmtall\OHLPall.xml" />
|
||||
<Content Include="fmtall\PROMSDemo1all.xml" />
|
||||
<Content Include="fmtall\PROMSDemo2all.xml" />
|
||||
<Content Include="fmtall\PROMSDemoALRall.xml" />
|
||||
<Content Include="fmtall\PROMSDemoBCKall.xml" />
|
||||
<Content Include="fmtall\PROMSMan1all.xml" />
|
||||
<Content Include="fmtall\PROMSMan2all.xml" />
|
||||
<Content Include="fmtall\RGEall.xml" />
|
||||
@@ -505,6 +509,10 @@
|
||||
<Content Include="genmacall\nspsam.svg" />
|
||||
<Content Include="genmacall\nspsamdev.svg" />
|
||||
<Content Include="genmacall\ohlp.svg" />
|
||||
<Content Include="genmacall\PROMSDemo1.svg" />
|
||||
<Content Include="genmacall\PROMSDemo2.svg" />
|
||||
<Content Include="genmacall\PROMSDemoALR.svg" />
|
||||
<Content Include="genmacall\PROMSDemoBCK.svg" />
|
||||
<Content Include="genmacall\PROMSMan1.svg" />
|
||||
<Content Include="genmacall\PROMSMan2.svg" />
|
||||
<Content Include="genmacall\rge.svg" />
|
||||
|
Reference in New Issue
Block a user