From 0c37716c18abcb7aa2644c2bc715b3689ea9ddfc Mon Sep 17 00:00:00 2001
From: Julian Oes <julian@oes.ch>
Date: Tue, 16 Feb 2016 14:21:51 +0100
Subject: [PATCH] sensors: remove merge leftover

---
 src/modules/sensors/sensors.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/modules/sensors/sensors.cpp b/src/modules/sensors/sensors.cpp
index 54cd7a2b83..e5060cfe17 100644
--- a/src/modules/sensors/sensors.cpp
+++ b/src/modules/sensors/sensors.cpp
@@ -2250,8 +2250,6 @@ Sensors::task_main()
 			}
 		}
 
-#endif
-
 		/* check battery voltage */
 		adc_poll(raw);