From 39874e472e540ca1bb923b97b52900e1d60439cc 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"

---
 .../src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c  | 5 -----
 1 file changed, 5 deletions(-)

(limited to '2.3-1/src/c/scilab-arduino/cmd_analog_in_volt')

diff --git a/2.3-1/src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c b/2.3-1/src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c
index 27f63c75..7018df2c 100644
--- a/2.3-1/src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c
+++ b/2.3-1/src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c
@@ -15,13 +15,8 @@
 
 float u8cmd_analog_in_volts(uint8 board_no, uint8 pin)
 {
-<<<<<<< HEAD
     float a;
     a = ((5*(float)analogRead(pin))/1023);
-=======
-    float a;					//declaration of variable
-    a = ((5*(float)analogRead(pin))/1023);	//recieved 10 bit input from analog pin is convert to voltage(0 - 50
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
     return(a);
 }
 
-- 
cgit