diff options
Diffstat (limited to '2.3-1/macros/SymbolTable')
| -rw-r--r-- | 2.3-1/macros/SymbolTable/ST_AnalyzeScope.sci | 4 | ||||
| -rw-r--r-- | 2.3-1/macros/SymbolTable/names | 3 |
2 files changed, 0 insertions, 7 deletions
diff --git a/2.3-1/macros/SymbolTable/ST_AnalyzeScope.sci b/2.3-1/macros/SymbolTable/ST_AnalyzeScope.sci index f3b041a0..8389c09a 100644 --- a/2.3-1/macros/SymbolTable/ST_AnalyzeScope.sci +++ b/2.3-1/macros/SymbolTable/ST_AnalyzeScope.sci @@ -84,10 +84,6 @@ 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
diff --git a/2.3-1/macros/SymbolTable/names b/2.3-1/macros/SymbolTable/names index 2ce0db05..c2efc843 100644 --- a/2.3-1/macros/SymbolTable/names +++ b/2.3-1/macros/SymbolTable/names @@ -6,10 +6,7 @@ ST_GetInArgInfo ST_GetSymbolInfo ST_InsForCntVars ST_InsOutArg -<<<<<<< HEAD ST_InsOutArg_Dup -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 ST_Load ST_MatchSymbol ST_Save |