diff options
Diffstat (limited to '2.3-1/macros/Scilab-Arduino')
| -rw-r--r-- | 2.3-1/macros/Scilab-Arduino/GetArduinoFunctions.sci | 4 | ||||
| -rw-r--r-- | 2.3-1/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/2.3-1/macros/Scilab-Arduino/GetArduinoFunctions.sci b/2.3-1/macros/Scilab-Arduino/GetArduinoFunctions.sci index bd532374..eff61fe6 100644 --- a/2.3-1/macros/Scilab-Arduino/GetArduinoFunctions.sci +++ b/2.3-1/macros/Scilab-Arduino/GetArduinoFunctions.sci @@ -31,10 +31,6 @@ ArduinoFunctions = [ "cmd_servo_attach" "cmd_servo_detach" "cmd_servo_move" -<<<<<<< HEAD "i2c_dev"]; -======= - "cmd_i2c_dev"]; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci b/2.3-1/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci index f5c64bc9..d310648e 100644 --- a/2.3-1/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci +++ b/2.3-1/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci @@ -25,11 +25,7 @@ ArduinoSetupFunctions = [ "cmd_dcmotor_setup" "cmd_servo_attach" "cmd_servo_detach" -<<<<<<< HEAD "i2c_dev"]; -======= - "cmd_i2c_dev"]; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction |