fixed conflict resolution

This commit is contained in:
pinkit-cwa 2020-08-21 02:52:18 +02:00 committed by GitHub
parent f999e1ae03
commit 903f5afcda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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 ""
) )