Updated to work with Arduino Primo
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/9a4c6c16 Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/tree/9a4c6c16 Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/diff/9a4c6c16 Branch: refs/heads/develop Commit: 9a4c6c164ffaaaa37dbf072b679b88a2785a612a Parents: 19ab179 Author: David G. Simmons <[email protected]> Authored: Fri Jan 13 12:06:15 2017 -0500 Committer: David G. Simmons <[email protected]> Committed: Tue Jan 17 10:16:18 2017 -0500 ---------------------------------------------------------------------- docs/os/tutorials/air_quality_ble.md | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/9a4c6c16/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 c35adb6..7e35660 100644 --- a/docs/os/tutorials/air_quality_ble.md +++ b/docs/os/tutorials/air_quality_ble.md @@ -1,6 +1,10 @@ ## 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.
