diff options
| author | Brijeshcr | 2017-07-08 20:18:17 +0530 |
|---|---|---|
| committer | GitHub | 2017-07-08 20:18:17 +0530 |
| commit | 39874e472e540ca1bb923b97b52900e1d60439cc (patch) | |
| tree | e0f47fecb8b5d5e63491c7440d9ecc3072e5cd05 /2.3-1/src/c/scilab-arduino/default_files | |
| parent | 3adebb16388c6712f7d9c268b91849d164e696df (diff) | |
| download | Scilab2C-39874e472e540ca1bb923b97b52900e1d60439cc.tar.gz Scilab2C-39874e472e540ca1bb923b97b52900e1d60439cc.tar.bz2 Scilab2C-39874e472e540ca1bb923b97b52900e1d60439cc.zip | |
Revert "SCi2cDeps updated, Windows compatibility resolved"
Diffstat (limited to '2.3-1/src/c/scilab-arduino/default_files')
| -rw-r--r-- | 2.3-1/src/c/scilab-arduino/default_files/sci2c_arduino.ino | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/2.3-1/src/c/scilab-arduino/default_files/sci2c_arduino.ino b/2.3-1/src/c/scilab-arduino/default_files/sci2c_arduino.ino index 5d5d101b..df28950c 100644 --- a/2.3-1/src/c/scilab-arduino/default_files/sci2c_arduino.ino +++ b/2.3-1/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() { |