fixed pull conflict

2021-12-22 16:09:34 +08:00 · 2021-12-22 16:09:34 +08:00 · 2af68252cb
parent ebb1321b7c f98689fc30
commit 2af68252cb
1 changed files with 0 additions and 1 deletions
--- a/APP_Framework/Applications/control_app/lwip_demo/lwip_udp_demo.c
+++ b/APP_Framework/Applications/control_app/lwip_demo/lwip_udp_demo.c
@ -63,4 +63,3 @@ int LwipUdpDemo(int argc, char *argv[])
 SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN),
    UdpTest, LwipUdpDemo,  UDP socket demo function);
 #endif
-