summaryrefslogtreecommitdiff
path: root/macros/ToolInitialization/ManageNextConversion.sci
diff options
context:
space:
mode:
authoryash11122017-07-07 22:03:16 +0530
committeryash11122017-07-07 22:03:16 +0530
commit69c573fe2e59236f063aaa94dcd44b556f945cbc (patch)
tree08fa381bec620e38c7a3d2a34448d30160d861eb /macros/ToolInitialization/ManageNextConversion.sci
parent87823db220f4c3b8bee16c0b2e08027704de1efe (diff)
parent3f52712f806fbd80d66dfdcaff401e5cf94dcca4 (diff)
downloadScilab2C_fossee_old-69c573fe2e59236f063aaa94dcd44b556f945cbc.tar.gz
Scilab2C_fossee_old-69c573fe2e59236f063aaa94dcd44b556f945cbc.tar.bz2
Scilab2C_fossee_old-69c573fe2e59236f063aaa94dcd44b556f945cbc.zip
Scilab2C Arduino Updated
Diffstat (limited to 'macros/ToolInitialization/ManageNextConversion.sci')
-rw-r--r--macros/ToolInitialization/ManageNextConversion.sci3
1 files changed, 3 insertions, 0 deletions
diff --git a/macros/ToolInitialization/ManageNextConversion.sci b/macros/ToolInitialization/ManageNextConversion.sci
index b0d4337..2073ed3 100644
--- a/macros/ToolInitialization/ManageNextConversion.sci
+++ b/macros/ToolInitialization/ManageNextConversion.sci
@@ -44,8 +44,11 @@ FlagContinueTranslation = 0;
// --- Finalize the current C code. ---
// ------------------------------------
C_FinalizeCode(FileInfo,SharedInfo);
+<<<<<<< HEAD
//PrintStringInfo(' hello',ReportFileName,'file','y');
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// ------------------------------------------------
// --- Identify the next function to translate. ---