From 3833a4277a6ee0d4f3985ceda93a2f6af5e02fdf Mon Sep 17 00:00:00 2001
From: wgz-code <61766729+wgz-code@users.noreply.github.com>
Date: Tue, 6 Sep 2022 09:20:58 +0800
Subject: [PATCH] fix  Merge conflict

---
 APP_Framework/Framework/connection/lora/e220/e220.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/APP_Framework/Framework/connection/lora/e220/e220.c b/APP_Framework/Framework/connection/lora/e220/e220.c
index ee4cbfa1a..6ae896a97 100644
--- a/APP_Framework/Framework/connection/lora/e220/e220.c
+++ b/APP_Framework/Framework/connection/lora/e220/e220.c
@@ -613,10 +613,9 @@ static void LoraOpen(void)
 
     E220Open(adapter);
 }
-
-#ifdef ADD_RTTHREAD_FETURES
 MSH_CMD_EXPORT(LoraOpen,Lora open test sample);
 
+#ifdef ADD_RTTHREAD_FETURES
 static void LoraRead(void *parameter)
 {
 	int RevLen;