Air Quality and BLE

Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/commit/2a57311a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/tree/2a57311a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/diff/2a57311a

Branch: refs/heads/develop
Commit: 2a57311a09705e2de0b45cc1da861754023e6371
Parents: f98fec5
Author: David G. Simmons <[email protected]>
Authored: Tue Jan 17 10:06:06 2017 -0500
Committer: David G. Simmons <[email protected]>
Committed: Tue Jan 17 10:06:06 2017 -0500

----------------------------------------------------------------------
 docs/os/tutorials/air_quality_ble.md | 4 ----
 1 file changed, 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/2a57311a/docs/os/tutorials/air_quality_ble.md
----------------------------------------------------------------------
diff --git a/docs/os/tutorials/air_quality_ble.md 
b/docs/os/tutorials/air_quality_ble.md
index 7e35660..c4b085d 100644
--- a/docs/os/tutorials/air_quality_ble.md
+++ b/docs/os/tutorials/air_quality_ble.md
@@ -1,10 +1,6 @@
 ## Air quality sensor project via Bluetooth
 
-<<<<<<< HEAD
-This is a follow-on project to the [Basic Air Quality 
Sensor](air_quality_esnsor.md) project so it is
-=======
 This is a follow-on project to the [Basic Air Quality 
Sensor](air_quality_sensor.md) project so it is
->>>>>>> Updated to work with Arduino Primo
 assumed that you have worked through that project and have your CO2 sensor 
working properly with
 your Arduino Primo board. 
 

Reply via email to