Merge branch 'feature-rebase' into 'develop'

feature-mergenoff:rebase

See merge request !2

frame/AAMMOD.FR2

@@ -21,7 +21,6 @@ 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
@@ -35,7 +34,7 @@ Version 50 TradeDesign®
 20030829       RI       SourceLine     ADDAMTFLG.set ( "X" )
 20030829       RI       SourceLine   endif
 20030829       RI       SourceLine endif
-                        sdfsd12124
+sdfsd23423
                         Rule -1
 20030901       RI       SourceLine function InternalGetOldMaxaam : numeric
 20030901       RI       SourceLine #! Get Old amount of MAXAAM