From ee085fc021c434c88d077cf0bd632d2ab87b7f3a Mon Sep 17 00:00:00 2001
From: ladyada <limor@ladyada.net>
Date: Mon, 14 Sep 2015 01:12:56 -0400
Subject: [PATCH] fix merge

---
 examples/bme280test/bme280test.ino | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/examples/bme280test/bme280test.ino b/examples/bme280test/bme280test.ino
index 5ffdc4d..2c321b6 100644
--- a/examples/bme280test/bme280test.ino
+++ b/examples/bme280test/bme280test.ino
@@ -47,15 +47,7 @@ void loop() {
     Serial.println(" *C");
 
     Serial.print("Pressure = ");
-<<<<<<< HEAD
-    Serial.print(bme.readPressure());
-    Serial.println(" Pa");
 
-    Serial.print("Approx altitude = ");
-    Serial.print(bme.readAltitude(1013.25)); // this should be adjusted to your local forcase
-    Serial.println(" m");
-    
-=======
     Serial.print(bme.readPressure() / 100.0F);
     Serial.println(" hPa");
 
@@ -63,7 +55,6 @@ void loop() {
     Serial.print(bme.readAltitude(SEALEVELPRESSURE_HPA));
     Serial.println(" m");
 
->>>>>>> 11ad05a034c3ef433825590ef39c8cc11cd1e50b
     Serial.print("Humidity = ");
     Serial.print(bme.readHumidity());
     Serial.println(" %");