diff options
Diffstat (limited to '2.3-1/macros/ASTManagement/AST_ParseOperStruct.sci')
| -rw-r--r-- | 2.3-1/macros/ASTManagement/AST_ParseOperStruct.sci | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/2.3-1/macros/ASTManagement/AST_ParseOperStruct.sci b/2.3-1/macros/ASTManagement/AST_ParseOperStruct.sci index cc992a9e..ce0bcc72 100644 --- a/2.3-1/macros/ASTManagement/AST_ParseOperStruct.sci +++ b/2.3-1/macros/ASTManagement/AST_ParseOperStruct.sci @@ -62,7 +62,6 @@ LabelFunctName = 'Operator: '; FunctionName = stripblanks(part(buffstring,length(LabelFunctName)+1:length(buffstring))); // Generate the proper function name. FunctionName = Operator2FunName(FunctionName); -<<<<<<< HEAD PrintStringInfo(' '+FunctionName,ReportFileName,'file','y'); if (FunctionName == 'OpLogAnd' | FunctionName=='OpLogOr') @@ -74,8 +73,6 @@ if (FunctionName == 'OpLogAnd' | FunctionName=='OpLogOr') //RhsField = AST_PopASTStack(); return ; end -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // ------------------------------ // --- Read input parameters. --- |