From 83417d747fda639316f60a2566d518547a2dae30 Mon Sep 17 00:00:00 2001
From: YunHorn Technology <dp.s@yunhorn.com>
Date: Fri, 1 Nov 2024 19:20:15 +0800
Subject: [PATCH] merged

---
 LoRaWAN/App/lora_app.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c
index e30352a..2d04230 100644
--- a/LoRaWAN/App/lora_app.c
+++ b/LoRaWAN/App/lora_app.c
@@ -493,13 +493,8 @@ void LoRaWAN_Init(void)
 
   LmHandlerJoin(ActivationType, ForceRejoin);
 
-<<<<<<< HEAD
-  UTIL_TIMER_Create(&YunhornSTSHeartBeatTimer, 1000*STS_HeartBeatTimerPeriod_sec, UTIL_TIMER_ONESHOT, OnYunhornSTSHeartBeatTimerEvent, NULL);
-  UTIL_TIMER_Start(&YunhornSTSHeartBeatTimer);
-=======
     UTIL_TIMER_Create(&YunhornSTSHeartBeatTimer, 1000*STS_HeartBeatTimerPeriod_sec, UTIL_TIMER_PERIODIC, OnYunhornSTSHeartBeatTimerEvent, NULL);
     UTIL_TIMER_Start(&YunhornSTSHeartBeatTimer);
->>>>>>> f8f6e7269c1966577403a035f83fec62bab884d9
 
   if (EventType == TX_ON_TIMER)
   {