diff options
Diffstat (limited to 'src/c/scilab-arduino/includes/cmd_i2c_dev.h')
| -rw-r--r-- | src/c/scilab-arduino/includes/cmd_i2c_dev.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/c/scilab-arduino/includes/cmd_i2c_dev.h b/src/c/scilab-arduino/includes/cmd_i2c_dev.h index 861a8e7..85d154a 100644 --- a/src/c/scilab-arduino/includes/cmd_i2c_dev.h +++ b/src/c/scilab-arduino/includes/cmd_i2c_dev.h @@ -1,3 +1,18 @@ +<<<<<<< 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 #ifndef __CMD_I2C_DEV_H__ #define __CMD_I2C_DEV_H__ |