summaryrefslogtreecommitdiff
path: root/2.3-1/macros/ASTManagement/AST_ParseFuncallStruct.sci
diff options
context:
space:
mode:
Diffstat (limited to '2.3-1/macros/ASTManagement/AST_ParseFuncallStruct.sci')
-rw-r--r--2.3-1/macros/ASTManagement/AST_ParseFuncallStruct.sci3
1 files changed, 0 insertions, 3 deletions
diff --git a/2.3-1/macros/ASTManagement/AST_ParseFuncallStruct.sci b/2.3-1/macros/ASTManagement/AST_ParseFuncallStruct.sci
index ac9c4004..3c322dd5 100644
--- a/2.3-1/macros/ASTManagement/AST_ParseFuncallStruct.sci
+++ b/2.3-1/macros/ASTManagement/AST_ParseFuncallStruct.sci
@@ -87,13 +87,10 @@ NOutArg = eval(stripblanks(part(buffstring,10:length(buffstring))));
buffstring = AST_PopASTStack();
FunctionName = stripblanks(part(buffstring,12:length(buffstring)));
-<<<<<<< HEAD
//if (FunctionName == 'disp')
// NOutArg = 0;
//end
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// -------------------------------------
// --- Generate the InArg structure. ---
// -------------------------------------