diff options
| author | yash1112 | 2017-07-07 22:03:16 +0530 |
|---|---|---|
| committer | yash1112 | 2017-07-07 22:03:16 +0530 |
| commit | 69c573fe2e59236f063aaa94dcd44b556f945cbc (patch) | |
| tree | 08fa381bec620e38c7a3d2a34448d30160d861eb /src/c/scilab-arduino/default_files/sci2c_arduino.ino | |
| parent | 87823db220f4c3b8bee16c0b2e08027704de1efe (diff) | |
| parent | 3f52712f806fbd80d66dfdcaff401e5cf94dcca4 (diff) | |
| download | Scilab2C_fossee_old-69c573fe2e59236f063aaa94dcd44b556f945cbc.tar.gz Scilab2C_fossee_old-69c573fe2e59236f063aaa94dcd44b556f945cbc.tar.bz2 Scilab2C_fossee_old-69c573fe2e59236f063aaa94dcd44b556f945cbc.zip | |
Scilab2C Arduino Updated
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() { |