~Re-committing after merge conflict

Merge pull request '~Added the word "Step" after "Go To" and to the Through and And transition types.' (#251 ) from F2024-022 into Development
Merging into Development. No code review needed since formats are under development.
2024-02-29 10:43:05 -05:00 · 2024-02-29 09:00:35 -05:00 · 2024-02-29 08:59:45 -05:00 · 2024-02-28 10:46:06 -05:00 · 2024-02-28 09:16:47 -05:00 · 2024-02-27 15:22:15 -05:00
1 changed files with 0 additions and 0 deletions
--- a/PROMS/Formats/fmtall/VEGP2all.xml
+++ b/PROMS/Formats/fmtall/VEGP2all.xml
Author	SHA1	Message	Date
Chris Glavan	88391824eb	~Re-committing after merge conflict	2024-02-29 10:43:05 -05:00
Chris Glavan	3a44d4cd0e	Merge pull request '~Added the word "Step" after "Go To" and to the Through and And transition types.' (#251 ) from F2024-022 into Development Merging into Development. No code review needed since formats are under development.	2024-02-29 09:00:35 -05:00
Chris Glavan	e6f9ae3623	~Added the word "Step" after "Go To" and to the Through and And transition types.	2024-02-29 08:59:45 -05:00
John Jenko	8fa08b09fa	Merge pull request 'C2024-003-Print-Sub-Section' (#241 ) from C2024-003 into Development ready to build and test	2024-02-28 10:46:06 -05:00
Paul Larsen	578b8842f7	C2024-003-print-sub-section	2024-02-28 09:16:47 -05:00
John Jenko	1db167e5ca	Merge pull request 'F2024-026 - Added a transition type that is just a section number in parentheses in the Vogtle Alarms format.' (#249 ) from Vogtle3&4 into Development format only change	2024-02-27 15:22:15 -05:00
John Jenko	78020ca40a	F2024-026 - Added a transition type that is just a section number in parentheses in the Vogtle Alarms format.	2024-02-27 15:22:29 -05:00
Paul Larsen	fcaa0ce41d	C2024-003-print-sub-section	2024-02-27 12:02:21 -05:00
Paul Larsen	3710e871a9	Merge remote-tracking branch 'origin/Development' into C2024-003	2024-02-27 10:31:20 -05:00
Paul Larsen	15048a317f	Merge remote-tracking branch 'origin/Development' into C2024-003	2024-02-27 09:11:59 -05:00
Paul Larsen	9e56422df8	C2024-003-print-sub-section	2024-02-26 23:00:29 -05:00
Paul Larsen	092ed83ca4	C2024-003-print-sub-section	2024-02-26 16:06:04 -05:00
Paul Larsen	6078d30a94	Revert "F2024-006 Fixed pagination logic to that step text at the bottom of an Alarm Point page does not print on top of the bottom continue message" This reverts commit `82fa4f1e74`.	2024-02-26 15:08:52 -05:00
Paul Larsen	9804cf0fce	C2024-003-print-sub-section	2024-02-26 12:48:54 -05:00
Paul Larsen	72457d956e	C2024-003-print-sub-section	2024-02-26 10:04:57 -05:00
Paul Larsen	837978da92	C2024-003-print-sub-sections	2024-02-25 21:40:27 -05:00
Paul Larsen	dcfdf5f852	C2024-003-Print-Sub-Section	2024-02-22 16:54:56 -05:00