diff options
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() { |