X-Git-Url: http://git.smho.de/?a=blobdiff_plain;f=src%2FowDeviceConfig.cpp;fp=src%2FowDeviceConfig.cpp;h=0e4b3910a7d3a056c70241c4d08c3711659b383b;hb=8b3ce8126a8bbc16822e939bc46f513e1c52b3d3;hp=5c86c05a18688a25af90f743f658e0e56b6b5d31;hpb=2d637281cefcc16f27911887827217744880e74c;p=owTools.git

diff --git a/src/owDeviceConfig.cpp b/src/owDeviceConfig.cpp
index 5c86c05..0e4b391 100644
--- a/src/owDeviceConfig.cpp
+++ b/src/owDeviceConfig.cpp
@@ -284,11 +284,8 @@ double owDeviceConfig::calculateValueFromNumber(int code, int vn, std::vector<in
 			case 24:return V[vn]*1.1/1024.0;break;
 			case 25:return V[vn]*3.0/1024.0;break;
 			case 26:return V[vn]*5.0/1024.0;break;
-<<<<<<< HEAD
 			case 27:return ((double)V[2]+(double)V[1]/1000.0)/8.0;break;
 			case 28:return exp(V[vn]/2560.0);break;
-=======
->>>>>>> origin/master
 			default:return V[vn];
 		}
 }