forked from xuos/xiuos
				
			fix Merge conflict
This commit is contained in:
		
							parent
							
								
									5759661e8c
								
							
						
					
					
						commit
						3833a4277a
					
				| 
						 | 
					@ -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;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue