mirror of
https://github.com/Lurkars/esp-ena.git
synced 2024-11-22 18:16:10 +01:00
fixed conflict resolution
This commit is contained in:
parent
f999e1ae03
commit
903f5afcda
@ -1,8 +1,6 @@
|
|||||||
idf_component_register(
|
idf_component_register(
|
||||||
SRCS
|
SRCS
|
||||||
"main.c"
|
"main.c"
|
||||||
"display-interface.c"
|
|
||||||
"wifi/espidf-v4.0.c"
|
|
||||||
|
|
||||||
INCLUDE_DIRS ""
|
INCLUDE_DIRS ""
|
||||||
)
|
)
|
||||||
|
Loading…
Reference in New Issue
Block a user