From bd03b38be0918837e147e969c6bb2014900009db Mon Sep 17 00:00:00 2001
From: Brijeshcr
Date: Sat, 8 Jul 2017 20:18:17 +0530
Subject: Revert "SCi2cDeps updated, Windows compatibility resolved"

---
 .../u8cmd_i2c_write_registers.cpp                       | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'src/c/scilab-arduino/cmd_i2c_write_register')

diff --git a/src/c/scilab-arduino/cmd_i2c_write_register/u8cmd_i2c_write_registers.cpp b/src/c/scilab-arduino/cmd_i2c_write_register/u8cmd_i2c_write_registers.cpp
index f10dd97..63cc7c7 100644
--- a/src/c/scilab-arduino/cmd_i2c_write_register/u8cmd_i2c_write_registers.cpp
+++ b/src/c/scilab-arduino/cmd_i2c_write_register/u8cmd_i2c_write_registers.cpp
@@ -1,20 +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
-*/
-
-
-//This function writes to the register of the device
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 #include "cmd_i2c_write_register.h"
 #include "Arduino.h"
 #include "Wire.h"
-- 
cgit