From dc4a139f88437500d37bbfa3427751352fea213c Mon Sep 17 00:00:00 2001
From: Florent de Lamotte <florent@frizoncorrea.fr>
Date: Tue, 11 Mar 2025 09:18:50 +0100
Subject: [PATCH] resolve conflict

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

diff --git a/platformio.ini b/platformio.ini
index f6221c51e..be098c431 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -781,7 +781,6 @@ build_flags = ${nrf52840_t1000e.build_flags}
   -D RADIO_CLASS=CustomLR1110
   -D WRAPPER_CLASS=CustomLR1110Wrapper
   -D MAX_LORA_TX_POWER=22
-  -D LORA_TX_POWER=22
 build_src_filter = ${nrf52840_t1000e.build_src_filter}
   +<helpers/*.cpp>
   +<helpers/nrf52/T1000eBoard.cpp>