feature-merge:merge

65650392 · wangguangchao · 0e073989 · ecbdbd37 · 65650392 · 65650392
Commit 65650392 authored Oct 09, 2023 by wangguangchao
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletions

111.txt 111.txt +2 -0

222.txt 222.txt +2 -0

AAMMOD.FR2 frame/AAMMOD.FR2 +1 -0

AAMMOD.FR5 frame/AAMMOD.FR5 +1 -1

No files found.
--- a/111.txt
+++ b/111.txt
+sdfsd
\ No newline at end of file
--- a/222.txt
+++ b/222.txt
+sdfsdf
\ No newline at end of file
--- a/frame/AAMMOD.FR2
+++ b/frame/AAMMOD.FR2
@@ -21,6 +21,7 @@ Version 50 TradeDesign®
 20030829       RI       SourceLine Disable
 20030829       RI       SourceLine = MAX\CUR
                        Rule -1
+                        sdfsd
 20041116       KFP      SourceLine default OPN2\CUR order 2000
 20030829       RI       SourceLine Disable
 20030916       RI       SourceLine = MAX2\CUR

--- a/frame/AAMMOD.FR5
+++ b/frame/AAMMOD.FR5
@@ -17,7 +17,7 @@ Version 50 TradeDesign®
 20070202       MV       SourceLine     SysWarningSet( SYSWRNTypeWarning, "", "Addamtchk" )
 20070202       MV       SourceLine   endif
 20070202       MV       SourceLine endif
-45576575
+sdfsdf45576575

                        FramePanel AAMDRWP PF000003 200 50 0 0 0 0 0 0 0 0
                        PComment These two transactions are showing the additional amounts on the right side of the panel, i.e. Label and amount in seperate lines