From eabc45061a9dfdcabc2622e2fa8c473fd77c106f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xose=20P=C3=A9rez?= <xose.perez@gmail.com>
Date: Thu, 21 Jun 2018 10:13:17 +0200
Subject: [PATCH] Remove merge marks

---
 code/platformio.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/platformio.ini b/code/platformio.ini
index 482b060c..a3018e64 100644
--- a/code/platformio.ini
+++ b/code/platformio.ini
@@ -2426,7 +2426,6 @@ upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 extra_scripts = ${common.extra_scripts}
 modules = ${common.modules} sensor
 
-<<<<<<< HEAD
 [env:blitzwolf-bwshp2]
 platform = ${common.platform}
 framework = arduino