[mynewt-core] branch master updated: fix conflicts caused by the bmp280 merge

[vi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vipulrahane pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git


The following commit(s) were added to refs/heads/master by this push:
     new 72f8aec  fix conflicts caused by the bmp280 merge
72f8aec is described below

commit 72f8aecc2889cb018d1dd457728ae3c08155fd8d
Author: Vipul Rahane <vi...@apache.org>
AuthorDate: Wed Oct 11 14:22:42 2017 -0700

    fix conflicts caused by the bmp280 merge
---
 hw/sensor/creator/src/sensor_creator.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/hw/sensor/creator/src/sensor_creator.c b/hw/sensor/creator/src/sensor_creator.c
index 7faeff7..0c73329 100644
--- a/hw/sensor/creator/src/sensor_creator.c
+++ b/hw/sensor/creator/src/sensor_creator.c
@@ -40,13 +40,13 @@
 #if MYNEWT_VAL(BME280_OFB)
 #include <bme280/bme280.h>
 #endif
-<<<<<<< HEAD
+
 #if MYNEWT_VAL(MS5837_OFB)
 #include <ms5837/ms5837.h>
-=======
+#endif
+
 #if MYNEWT_VAL(BMP280_OFB)
 #include <bmp280/bmp280.h>
->>>>>>> MYNEWT-840 bmp280 driver and sensor fmwk support
 #endif
 
 /* Driver definitions */
@@ -74,13 +74,12 @@ static struct tcs34725 tcs34725;
 static struct bme280 bme280;
 #endif
 
-<<<<<<< HEAD
 #if MYNEWT_VAL(MS5837_OFB)
 static struct ms5837 ms5837;
-=======
+#endif
+
 #if MYNEWT_VAL(BMP280_OFB)
 static struct bmp280 bmp280;
->>>>>>> MYNEWT-840 bmp280 driver and sensor fmwk support
 #endif
 
 /**

-- 
To stop receiving notification emails like this one, please contact
['"commits@mynewt.apache.org" <co...@mynewt.apache.org>'].