Merge pull request 'Development' (#174 ) from Development into master

Merging F2023-149 from development into master. No testing required since formats are under development.
Merge pull request 'F2023-149' (#173 ) from F2023-149_Vogtle34Alarm_AND_OR_separators into Development
2023-12-05 16:30:39 -05:00 · 2023-12-05 16:28:36 -05:00 · 2023-12-05 16:26:00 -05:00
5 changed files with 2 additions and 0 deletions
--- a/PROMS/Formats/Formats.csproj
+++ b/PROMS/Formats/Formats.csproj
@ -376,6 +376,7 @@
    <Content Include="fmtall\wst1all.xml" />
    <Content Include="fmtall\wst2all.xml" />
    <Content Include="fmtall\wstalrall.xml" />
+    <Content Include="fmtall\VEGPBckall.xml" />
    <Content Include="fmtall\wstbckall.xml" />
    <Content Include="fmtall\wstcklall.xml" />
    <Content Include="fmtall\wstdcsall.xml" />
@ -510,6 +511,7 @@
    <Content Include="genmacall\shervsu.svg" />
    <Content Include="genmacall\shesam.svg" />
    <Content Include="genmacall\shessd.svg" />
+    <Content Include="genmacall\VEGPBck.svg" />
    <Content Include="genmacall\VEGP1.svg" />
    <Content Include="genmacall\VEGP2.svg" />
    <Content Include="genmacall\VEGPAlr.svg" />
--- a/PROMS/Formats/fmtall/VEGP1all.xml
+++ b/PROMS/Formats/fmtall/VEGP1all.xml
--- a/PROMS/Formats/fmtall/VEGPAlrall.xml
+++ b/PROMS/Formats/fmtall/VEGPAlrall.xml
--- a/PROMS/Formats/fmtall/VEGPBckall.xml
+++ b/PROMS/Formats/fmtall/VEGPBckall.xml
--- a/PROMS/Formats/genmacall/VEGPBck.svg
+++ b/PROMS/Formats/genmacall/VEGPBck.svg
Author	SHA1	Message	Date
Devin Jankowski	5ba51e8392	Merge pull request 'Development' (#174 ) from Development into master Merging F2023-149 from development into master. No testing required since formats are under development.	2023-12-05 16:30:39 -05:00
John Jenko	e33902b912	Merge pull request 'F2023-149' (#173 ) from F2023-149_Vogtle34Alarm_AND_OR_separators into Development Format only change.	2023-12-05 16:28:36 -05:00
John Jenko	f65d2067ba	F2023-149 Changed the AND and OR separators so that they are no longer underlined	2023-12-05 16:26:00 -05:00