fixed pull conflict
This commit is contained in:
commit
2af68252cb
|
@ -63,4 +63,3 @@ int LwipUdpDemo(int argc, char *argv[])
|
||||||
SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN),
|
SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN),
|
||||||
UdpTest, LwipUdpDemo, UDP socket demo function);
|
UdpTest, LwipUdpDemo, UDP socket demo function);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue