diff options
Diffstat (limited to 'src/c/scilab-arduino/default_files/sci2c_arduino.ino')
| -rw-r--r-- | src/c/scilab-arduino/default_files/sci2c_arduino.ino | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/c/scilab-arduino/default_files/sci2c_arduino.ino b/src/c/scilab-arduino/default_files/sci2c_arduino.ino index df28950..5d5d101 100644 --- a/src/c/scilab-arduino/default_files/sci2c_arduino.ino +++ b/src/c/scilab-arduino/default_files/sci2c_arduino.ino @@ -11,8 +11,13 @@ */ #include "Arduino.h" +<<<<<<< HEAD #include <loop_arduino.h> #include <setup_arduino.h> +======= +#include "loop_arduino.h" +#include "setup_arduino.h" +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 void setup() { |