summaryrefslogtreecommitdiff
path: root/macros/CCodeGeneration/names
diff options
context:
space:
mode:
authorBrijeshcr2017-07-08 20:18:17 +0530
committerGitHub2017-07-08 20:18:17 +0530
commitbd03b38be0918837e147e969c6bb2014900009db (patch)
tree2cd9b7b1c15092e1367ed15e81aa71ccc9e05190 /macros/CCodeGeneration/names
parent97d1c6847a05bdb93557553a6bdcfd0f15feda99 (diff)
downloadscilab2c-bd03b38be0918837e147e969c6bb2014900009db.tar.gz
scilab2c-bd03b38be0918837e147e969c6bb2014900009db.tar.bz2
scilab2c-bd03b38be0918837e147e969c6bb2014900009db.zip
Revert "SCi2cDeps updated, Windows compatibility resolved"
Diffstat (limited to 'macros/CCodeGeneration/names')
-rw-r--r--macros/CCodeGeneration/names3
1 files changed, 0 insertions, 3 deletions
diff --git a/macros/CCodeGeneration/names b/macros/CCodeGeneration/names
index 96b24bdd..56caa81d 100644
--- a/macros/CCodeGeneration/names
+++ b/macros/CCodeGeneration/names
@@ -2,10 +2,7 @@ C_FinalizeCode
C_ForExpression
C_Funcall
C_GenDeclarations
-<<<<<<< HEAD
C_GenDeclarations_Dup
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
C_GenerateFunName
C_GenerateLaunchScript
C_GenerateMakefile