summaryrefslogtreecommitdiff
path: root/macros/ASTManagement/AST_ParseFuncallStruct.sci
diff options
context:
space:
mode:
Diffstat (limited to 'macros/ASTManagement/AST_ParseFuncallStruct.sci')
-rw-r--r--macros/ASTManagement/AST_ParseFuncallStruct.sci3
1 files changed, 3 insertions, 0 deletions
diff --git a/macros/ASTManagement/AST_ParseFuncallStruct.sci b/macros/ASTManagement/AST_ParseFuncallStruct.sci
index 3c322dd..ac9c400 100644
--- a/macros/ASTManagement/AST_ParseFuncallStruct.sci
+++ b/macros/ASTManagement/AST_ParseFuncallStruct.sci
@@ -87,10 +87,13 @@ 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. ---
// -------------------------------------