From c15af62a46f3f9b102a5e429066b097cec3a6d6e Mon Sep 17 00:00:00 2001
From: fvanroie <cpt_jack@msn.com>
Date: Thu, 30 Apr 2020 17:42:44 +0200
Subject: [PATCH] Fix merge issue

---
 platformio.ini        | 4 +++-
 src/hasp_dispatch.cpp | 5 +----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 81b7f8d9..3c9bec90 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -88,6 +88,7 @@ esp32_flags=
 stm32_flags=
     ${env.build_flags}
     -D IRAM_ATTR=                   ; No IRAM_ATTR available on STM32
+    -D STM32
 
 ; -- By default there are no ${override.build_flags} set
 ; -- to use it, copy platformio_override.ini from the template
@@ -144,7 +145,8 @@ build_flags =
     -D TFT_BCKL=-1 ;None, configurable via web UI (e.g. 2 for D4)
     -D TOUCH_CS=PC4 ;NC
     -D TFT_RST=-1  ;D4
-    -D STM32
+    -D HASP_OUTPUT_PIN=PA1 ; User LED D2 on DevEBox board
+    -D HASP_INPUT_PIN=PA0 ; User Button K1 on DevEBox board
 
 lib_deps =
     ${env.lib_deps}
diff --git a/src/hasp_dispatch.cpp b/src/hasp_dispatch.cpp
index a93a485e..43156964 100644
--- a/src/hasp_dispatch.cpp
+++ b/src/hasp_dispatch.cpp
@@ -98,10 +98,7 @@ void dispatchAttribute(String strTopic, const char * payload)
 {
     if(strTopic.startsWith("p[")) {
         dispatchButtonAttribute(strTopic, payload);
-<<<<<<< HEAD
-
-=======
->>>>>>> 408b27b8155bd5f1c11900503df88956925fa6bd
+        
     } else if(strTopic == F("page")) {
         dispatchPage(payload);