From 903f5afcda5d5b4853e20076ee2f8df1d6a7da3e Mon Sep 17 00:00:00 2001
From: pinkit-cwa <67099188+pinkit-cwa@users.noreply.github.com>
Date: Fri, 21 Aug 2020 02:52:18 +0200
Subject: [PATCH] fixed conflict resolution

---
 main/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index 70512c1..b15b151 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -1,8 +1,6 @@
 idf_component_register(
     SRCS 
         "main.c"
-        "display-interface.c"
-        "wifi/espidf-v4.0.c"
 
     INCLUDE_DIRS ""
 )