diff options
Diffstat (limited to 'macros/CCodeGeneration/C_GenerateMkfle_arduino.sci')
| -rw-r--r-- | macros/CCodeGeneration/C_GenerateMkfle_arduino.sci | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/macros/CCodeGeneration/C_GenerateMkfle_arduino.sci b/macros/CCodeGeneration/C_GenerateMkfle_arduino.sci index c66b976..2b9ca6c 100644 --- a/macros/CCodeGeneration/C_GenerateMkfle_arduino.sci +++ b/macros/CCodeGeneration/C_GenerateMkfle_arduino.sci @@ -1,3 +1,5 @@ +<<<<<<< HEAD +======= // Copyright (C) 2017 - IIT Bombay - FOSSEE // This file must be used under the terms of the CeCILL. @@ -10,6 +12,7 @@ // Email: toolbox@scilab.in +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 function C_GenerateMkfle_arduino(FileInfo,SharedInfo) PrintStringInfo('ARDUINO_DIR = /usr/share/arduino',FileInfo.MakefileFilename,'file','y','y'); |