diff options
Diffstat (limited to 'macros/ToolInitialization/ManageNextConversion.sci')
| -rw-r--r-- | macros/ToolInitialization/ManageNextConversion.sci | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/macros/ToolInitialization/ManageNextConversion.sci b/macros/ToolInitialization/ManageNextConversion.sci index b0d4337b..2073ed3e 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. ---
|