diff options
Diffstat (limited to 'src/c/scilab-arduino/cmd_i2c_read_register')
| -rw-r--r-- | src/c/scilab-arduino/cmd_i2c_read_register/u8cmd_i2c_read_registers.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/c/scilab-arduino/cmd_i2c_read_register/u8cmd_i2c_read_registers.cpp b/src/c/scilab-arduino/cmd_i2c_read_register/u8cmd_i2c_read_registers.cpp index fd07eb6b..6b54159c 100644 --- a/src/c/scilab-arduino/cmd_i2c_read_register/u8cmd_i2c_read_registers.cpp +++ b/src/c/scilab-arduino/cmd_i2c_read_register/u8cmd_i2c_read_registers.cpp @@ -1,3 +1,5 @@ +<<<<<<< HEAD +======= /* Copyright (C) 2017 - IIT Bombay - FOSSEE This file must be used under the terms of the CeCILL. @@ -12,6 +14,7 @@ //this function reads data from the device register with given address +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #include "cmd_i2c_read_register.h" #include "Arduino.h" #include "Wire.h" |