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"

---
 src/c/scilab-arduino/default_files/sci2c_arduino.ino | 5 -----
 1 file changed, 5 deletions(-)

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

diff --git a/src/c/scilab-arduino/default_files/sci2c_arduino.ino b/src/c/scilab-arduino/default_files/sci2c_arduino.ino
index 5d5d101b..df28950c 100644
--- a/src/c/scilab-arduino/default_files/sci2c_arduino.ino
+++ b/src/c/scilab-arduino/default_files/sci2c_arduino.ino
@@ -11,13 +11,8 @@
 */
 
 #include "Arduino.h"
-<<<<<<< HEAD
 #include <loop_arduino.h>
 #include <setup_arduino.h>
-=======
-#include "loop_arduino.h"
-#include "setup_arduino.h"
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 void setup()
 {
-- 
cgit