diff options
Diffstat (limited to '2.3-1/macros/CCodeGeneration/C_GenerateMkfle_arduino.sci')
| -rw-r--r-- | 2.3-1/macros/CCodeGeneration/C_GenerateMkfle_arduino.sci | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMkfle_arduino.sci b/2.3-1/macros/CCodeGeneration/C_GenerateMkfle_arduino.sci index 2b9ca6c9..b43eb442 100644 --- a/2.3-1/macros/CCodeGeneration/C_GenerateMkfle_arduino.sci +++ b/2.3-1/macros/CCodeGeneration/C_GenerateMkfle_arduino.sci @@ -1,18 +1,3 @@ -<<<<<<< HEAD -======= -// Copyright (C) 2017 - IIT Bombay - FOSSEE - -// This file must be used under the terms of the CeCILL. -// This source file is licensed as described in the file COPYING, which -// you should have received as part of this distribution. The terms -// are also available at -// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt -// Author: Yash Pratap Singh Tomar -// Organization: FOSSEE, IIT Bombay -// Email: toolbox@scilab.in - - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 function C_GenerateMkfle_arduino(FileInfo,SharedInfo) PrintStringInfo('ARDUINO_DIR = /usr/share/arduino',FileInfo.MakefileFilename,'file','y','y'); |