5 files changed, 0 insertions, 75 deletions
diff --git a/src/c/scilab-arduino/includes/cmd_i2c_dev.h b/src/c/scilab-arduino/includes/cmd_i2c_dev.h
index 85d154a..861a8e7 100644
--- a/src/c/scilab-arduino/includes/cmd_i2c_dev.h
+++ b/src/c/scilab-arduino/includes/cmd_i2c_dev.h
@@ -1,18 +1,3 @@
-<<<<<<< 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__
  
diff --git a/src/c/scilab-arduino/includes/cmd_i2c_read.h b/src/c/scilab-arduino/includes/cmd_i2c_read.h
index e49abcd..791bdd3 100644
--- a/src/c/scilab-arduino/includes/cmd_i2c_read.h
+++ b/src/c/scilab-arduino/includes/cmd_i2c_read.h
@@ -1,18 +1,3 @@
-<<<<<<< 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_READ_H__
 #define __CMD_I2C_READ_H__
  
diff --git a/src/c/scilab-arduino/includes/cmd_i2c_read_register.h b/src/c/scilab-arduino/includes/cmd_i2c_read_register.h
index 1b3a3cf..ea203ad 100644
--- a/src/c/scilab-arduino/includes/cmd_i2c_read_register.h
+++ b/src/c/scilab-arduino/includes/cmd_i2c_read_register.h
@@ -1,18 +1,3 @@
-<<<<<<< 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_READ_REGISTER_H__
 #define __CMD_I2C_READ_REGISTER_H__
  
diff --git a/src/c/scilab-arduino/includes/cmd_i2c_write.h b/src/c/scilab-arduino/includes/cmd_i2c_write.h
index 58667c7..6a57222 100644
--- a/src/c/scilab-arduino/includes/cmd_i2c_write.h
+++ b/src/c/scilab-arduino/includes/cmd_i2c_write.h
@@ -1,18 +1,3 @@
-<<<<<<< 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_WRITE_H__
 #define __CMD_I2C_WRITE_H__
  
diff --git a/src/c/scilab-arduino/includes/cmd_i2c_write_register.h b/src/c/scilab-arduino/includes/cmd_i2c_write_register.h
index bf8e788..ff1b9ec 100644
--- a/src/c/scilab-arduino/includes/cmd_i2c_write_register.h
+++ b/src/c/scilab-arduino/includes/cmd_i2c_write_register.h
@@ -1,18 +1,3 @@
-<<<<<<< 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_WRITE_REGISTER_H__
 #define __CMD_I2C_WRITE_REGISTER_H__