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

Merging B2024-014 from development into master after successful testing.
Merge pull request 'B2024-014 - Fixed issue where Bulleted High Level Step and Dashed Explicit And steps were missing from the step and sub-step list' (#258 ) from B2024-014_Westinghouse_BulletStep into Development
2024-03-04 15:02:18 -05:00 · 2024-03-04 14:04:36 -05:00 · 2024-03-04 14:04:22 -05:00
7 changed files with 6 additions and 2 deletions
--- a/PROMS/Formats/fmtall/wst1all.xml
+++ b/PROMS/Formats/fmtall/wst1all.xml
--- a/PROMS/Formats/fmtall/wst2all.xml
+++ b/PROMS/Formats/fmtall/wst2all.xml
--- a/PROMS/Formats/fmtall/wstalrall.xml
+++ b/PROMS/Formats/fmtall/wstalrall.xml
--- a/PROMS/Formats/fmtall/wstbckall.xml
+++ b/PROMS/Formats/fmtall/wstbckall.xml
--- a/PROMS/Formats/fmtall/wstdcsall.xml
+++ b/PROMS/Formats/fmtall/wstdcsall.xml
--- a/PROMS/Formats/fmtall/wstsamall.xml
+++ b/PROMS/Formats/fmtall/wstsamall.xml
--- a/Interface/Properties/AssemblyInfo.cs
+++ b/Interface/Properties/AssemblyInfo.cs
@ -44,8 +44,12 @@ using System.Runtime.InteropServices;
 //      Revision DHH (day - no leading zero, two digit hour - military time
 //
 // ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ********
-[assembly: AssemblyVersion("2.1.2402.2213")]
-[assembly: AssemblyFileVersion("2.1.2402.2213")]
+[assembly: AssemblyVersion("2.1.2403.413")]
+[assembly: AssemblyFileVersion("2.1.2403.413")]
+
+
+
+
Author	SHA1	Message	Date
Devin Jankowski	237144aff6	Merge pull request 'Development' (#259 ) from Development into master Merging B2024-014 from development into master after successful testing.	2024-03-04 15:02:18 -05:00
John Jenko	126eff7614	Merge pull request 'B2024-014 - Fixed issue where Bulleted High Level Step and Dashed Explicit And steps were missing from the step and sub-step list' (#258 ) from B2024-014_Westinghouse_BulletStep into Development format only change	2024-03-04 14:04:36 -05:00
John Jenko	82eeaeb351	B2024-014 - Fixed issue where Bulleted High Level Step and Dashed Explicit And steps were missing from the step and sub-step list	2024-03-04 14:04:22 -05:00