diff options
Diffstat (limited to '2.3-1/macros/SymbolTable/ST_AnalyzeScope.sci')
| -rw-r--r-- | 2.3-1/macros/SymbolTable/ST_AnalyzeScope.sci | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/2.3-1/macros/SymbolTable/ST_AnalyzeScope.sci b/2.3-1/macros/SymbolTable/ST_AnalyzeScope.sci index 8389c09a..f3b041a0 100644 --- a/2.3-1/macros/SymbolTable/ST_AnalyzeScope.sci +++ b/2.3-1/macros/SymbolTable/ST_AnalyzeScope.sci @@ -84,6 +84,10 @@ for cntout = 1:NOutArg // #RNU_RES_E
OutArg(cntout).Scope = 'Local';
end
+<<<<<<< HEAD +======= +
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // #RNU_RES_B
// --- Check in global symbol table. ---
// #RNU_RES_E
|