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

Merging F2023-134 from development into master. No testing required since formats are under development.
Merge pull request 'F2023-134' (#107 ) from F2023-134_dontUnderlineAfterUnderbar into Development
2023-08-24 15:01:12 -04:00 · 2023-08-24 14:59:31 -04:00 · 2023-08-24 14:56:37 -04:00
4 changed files with 3 additions and 2 deletions
--- a/PROMS/Formats/fmtall/VEGP1all.xml
+++ b/PROMS/Formats/fmtall/VEGP1all.xml
--- a/PROMS/Formats/fmtall/VEGP2all.xml
+++ b/PROMS/Formats/fmtall/VEGP2all.xml
--- a/PROMS/Formats/fmtall/VEGPAlrall.xml
+++ b/PROMS/Formats/fmtall/VEGPAlrall.xml
--- a/Interface/Properties/AssemblyInfo.cs
+++ b/Interface/Properties/AssemblyInfo.cs
@ -44,8 +44,9 @@ 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.2308.2110")]
-[assembly: AssemblyFileVersion("2.1.2308.2110")]
+[assembly: AssemblyVersion("2.1.2308.2414")]
+[assembly: AssemblyFileVersion("2.1.2308.2414")]
+
Author	SHA1	Message	Date
Devin Jankowski	c5577cc2bd	Merge pull request 'Development' (#108 ) from Development into master Merging F2023-134 from development into master. No testing required since formats are under development.	2023-08-24 15:01:12 -04:00
John Jenko	ad476d8de4	Merge pull request 'F2023-134' (#107 ) from F2023-134_dontUnderlineAfterUnderbar into Development format only change.	2023-08-24 14:59:31 -04:00
John Jenko	a472169c9d	F2023-134 Turned off the format flag that was underlining text after an underbar when printing a RO return value	2023-08-24 14:56:37 -04:00