diff options
Diffstat (limited to 'src/c/scilab-arduino/includes/cmd_i2c_write.h')
| -rw-r--r-- | src/c/scilab-arduino/includes/cmd_i2c_write.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/c/scilab-arduino/includes/cmd_i2c_write.h b/src/c/scilab-arduino/includes/cmd_i2c_write.h index 128f1af8..58667c70 100644 --- a/src/c/scilab-arduino/includes/cmd_i2c_write.h +++ b/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__ |