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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

4
.gitignore vendored
View File

@ -42,4 +42,6 @@ build
dependencies.lock
sdkconfig
sdkconfig.old
sdkconfig.old
.local