summaryrefslogtreecommitdiff
path: root/2.3-1/macros/ASTManagement/AST_ParseEqualStruct.sci
diff options
context:
space:
mode:
authorBrijeshcr2017-07-07 18:19:45 +0530
committerGitHub2017-07-07 18:19:45 +0530
commit5258fe20f21514eca1f7dc4ee384fe63c35c68a1 (patch)
treec0424024c16aa122a5a38686dfed75a4c4866e95 /2.3-1/macros/ASTManagement/AST_ParseEqualStruct.sci
parent8d1da9568248c9a0572da08a7039e75e84d782b0 (diff)
parenta505550d38b2b886c61863a85be67faf02ad604b (diff)
downloadScilab2C-5258fe20f21514eca1f7dc4ee384fe63c35c68a1.tar.gz
Scilab2C-5258fe20f21514eca1f7dc4ee384fe63c35c68a1.tar.bz2
Scilab2C-5258fe20f21514eca1f7dc4ee384fe63c35c68a1.zip
Merge pull request #12 from yash1112/master
SCi2cDeps updated, Windows compatibility resolved
Diffstat (limited to '2.3-1/macros/ASTManagement/AST_ParseEqualStruct.sci')
-rw-r--r--2.3-1/macros/ASTManagement/AST_ParseEqualStruct.sci4
1 files changed, 4 insertions, 0 deletions
diff --git a/2.3-1/macros/ASTManagement/AST_ParseEqualStruct.sci b/2.3-1/macros/ASTManagement/AST_ParseEqualStruct.sci
index 68bc3da7..528ddaee 100644
--- a/2.3-1/macros/ASTManagement/AST_ParseEqualStruct.sci
+++ b/2.3-1/macros/ASTManagement/AST_ParseEqualStruct.sci
@@ -123,7 +123,11 @@ end
// ------------------------
//#RNU_RES_B
PrintStringInfo('Function Name: '+FunctionName,ReportFileName,'file','y','n');
+<<<<<<< HEAD
PrintStringInfo('N Input Arguments: '+string(NInArg),ReportFileName,'file','y','n');
+=======
+PrintStringInfo('N Intput Arguments: '+string(NInArg),ReportFileName,'file','y','n');
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//#RNU_RES_E
if (SharedInfo.Equal.Nins > 0)
//#RNU_RES_B