summaryrefslogtreecommitdiff
path: root/macros/CCodeGeneration/names
diff options
context:
space:
mode:
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 96b24bd..56caa81 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