diff options
Diffstat (limited to 'src/c/scilab-arduino/interfaces')
5 files changed, 15 insertions, 0 deletions
diff --git a/src/c/scilab-arduino/interfaces/int_cmd_i2c_dev.h b/src/c/scilab-arduino/interfaces/int_cmd_i2c_dev.h index 85f3e3cb..c1de1b7a 100644 --- a/src/c/scilab-arduino/interfaces/int_cmd_i2c_dev.h +++ b/src/c/scilab-arduino/interfaces/int_cmd_i2c_dev.h @@ -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 #ifndef __INT_CMD_I2C_DEV_H__ #define __INT_CMD_I2C_DEV_H__ diff --git a/src/c/scilab-arduino/interfaces/int_cmd_i2c_read.h b/src/c/scilab-arduino/interfaces/int_cmd_i2c_read.h index 6ffd7ec7..ef114266 100644 --- a/src/c/scilab-arduino/interfaces/int_cmd_i2c_read.h +++ b/src/c/scilab-arduino/interfaces/int_cmd_i2c_read.h @@ -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 #ifndef __INT_CMD_I2C_READ_H__ #define __INT_CMD_I2C_READ_H__ diff --git a/src/c/scilab-arduino/interfaces/int_cmd_i2c_read_register.h b/src/c/scilab-arduino/interfaces/int_cmd_i2c_read_register.h index e848b69b..c2cdc65a 100644 --- a/src/c/scilab-arduino/interfaces/int_cmd_i2c_read_register.h +++ b/src/c/scilab-arduino/interfaces/int_cmd_i2c_read_register.h @@ -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 #ifndef __INT_CMD_I2C_READ_REGISTER_H__ #define __INT_CMD_I2C_READ_REGISTER_H__ diff --git a/src/c/scilab-arduino/interfaces/int_cmd_i2c_write.h b/src/c/scilab-arduino/interfaces/int_cmd_i2c_write.h index 3a015933..23474a74 100644 --- a/src/c/scilab-arduino/interfaces/int_cmd_i2c_write.h +++ b/src/c/scilab-arduino/interfaces/int_cmd_i2c_write.h @@ -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 #ifndef __INT_CMD_I2C_WRITE_H__ #define __INT_CMD_I2C_WRITE_H__ diff --git a/src/c/scilab-arduino/interfaces/int_cmd_i2c_write_register.h b/src/c/scilab-arduino/interfaces/int_cmd_i2c_write_register.h index 78a3382b..e385b3f7 100644 --- a/src/c/scilab-arduino/interfaces/int_cmd_i2c_write_register.h +++ b/src/c/scilab-arduino/interfaces/int_cmd_i2c_write_register.h @@ -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 #ifndef __INT_CMD_I2C_WRITE_REGISTER_H__ #define __INT_CMD_I2C_WRITE_REGISTER_H__ |