From bd03b38be0918837e147e969c6bb2014900009db Mon Sep 17 00:00:00 2001 From: Brijeshcr Date: Sat, 8 Jul 2017 20:18:17 +0530 Subject: Revert "SCi2cDeps updated, Windows compatibility resolved" --- macros/Scilab-Arduino/GetArduinoFunctions.sci | 4 ---- macros/Scilab-Arduino/GetArduinoSetupFunctions.sci | 4 ---- 2 files changed, 8 deletions(-) (limited to 'macros/Scilab-Arduino') diff --git a/macros/Scilab-Arduino/GetArduinoFunctions.sci b/macros/Scilab-Arduino/GetArduinoFunctions.sci index bd532374..eff61fe6 100644 --- a/macros/Scilab-Arduino/GetArduinoFunctions.sci +++ b/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/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci b/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci index f5c64bc9..d310648e 100644 --- a/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci +++ b/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 -- cgit