fix Merge conflict · 3833a4277a - xiuos - Trustie: Git with trustie

floratest5/xiuos

forked from xuos/xiuos

fix Merge conflict

This commit is contained in:

wgz-code

2022-09-06 09:20:58 +08:00

parent 5759661e8c

commit 3833a4277a

1 changed files with 1 additions and 2 deletions

									
										APP_Framework/Framework/connection/lora/e220/e220.c
									
		+1
		-2
	
												View File
												
					@@ -613,10 +613,9 @@ static void LoraOpen(void)

					    E220Open(adapter);

					    E220Open(adapter);

					}

					}

					#ifdef ADD_RTTHREAD_FETURES

					MSH_CMD_EXPORT(LoraOpen,Lora open test sample);

					MSH_CMD_EXPORT(LoraOpen,Lora open test sample);

					#ifdef ADD_RTTHREAD_FETURES

					static void LoraRead(void *parameter)

					static void LoraRead(void *parameter)

					{

					{

						int RevLen;

						int RevLen;