reverted conflict resolution

This commit is contained in:
pinkit-cwa
2020-08-21 03:46:48 +02:00
committed by GitHub
parent 903f5afcda
commit c2bb49b0ba
+2
View File
@@ -43,3 +43,5 @@ dependencies.lock
sdkconfig
sdkconfig.old
.local