diff options
Diffstat (limited to '2.3-1/src/c/scilab-arduino/includes')
5 files changed, 15 insertions, 0 deletions
diff --git a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_dev.h b/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_dev.h index 382c2b3e..85d154a3 100644 --- a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_dev.h +++ b/2.3-1/src/c/scilab-arduino/includes/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 __CMD_I2C_DEV_H__ #define __CMD_I2C_DEV_H__ diff --git a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_read.h b/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_read.h index e33ede3c..e49abcd3 100644 --- a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_read.h +++ b/2.3-1/src/c/scilab-arduino/includes/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 __CMD_I2C_READ_H__ #define __CMD_I2C_READ_H__ diff --git a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_read_register.h b/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_read_register.h index 50fba935..1b3a3cf9 100644 --- a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_read_register.h +++ b/2.3-1/src/c/scilab-arduino/includes/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 __CMD_I2C_READ_REGISTER_H__ #define __CMD_I2C_READ_REGISTER_H__ diff --git a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_write.h b/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_write.h index 128f1af8..58667c70 100644 --- a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_write.h +++ b/2.3-1/src/c/scilab-arduino/includes/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 __CMD_I2C_WRITE_H__ #define __CMD_I2C_WRITE_H__ diff --git a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_write_register.h b/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_write_register.h index 7fac4cbb..bf8e7886 100644 --- a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_write_register.h +++ b/2.3-1/src/c/scilab-arduino/includes/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 __CMD_I2C_WRITE_REGISTER_H__ #define __CMD_I2C_WRITE_REGISTER_H__ |