mirror of
https://github.com/Lurkars/esp-ena.git
synced 2024-12-22 13:25:18 +01:00
reverted conflict resolution
This commit is contained in:
parent
903f5afcda
commit
c2bb49b0ba
4
.gitignore
vendored
4
.gitignore
vendored
@ -42,4 +42,6 @@ build
|
||||
dependencies.lock
|
||||
|
||||
sdkconfig
|
||||
sdkconfig.old
|
||||
sdkconfig.old
|
||||
|
||||
.local
|
||||
|
Loading…
Reference in New Issue
Block a user