diff options
author | Jean-François Milants <jf@codingfield.com> | 2021-02-14 14:19:30 +0100 |
---|---|---|
committer | Jean-François Milants <jf@codingfield.com> | 2021-02-14 14:19:30 +0100 |
commit | 5fdfb2112e2f6413c4d01c74dd04492e27a6d406 (patch) | |
tree | 983bd7fb1780c433aa12331377e67ced9b46b3a8 /src/libs/mynewt-nimble/apps/blecent/syscfg.yml | |
parent | 4c3803450e33e321dd2f90bdf62b9abe99f1e491 (diff) | |
parent | 1e2cc3ce91b402459790332b84e3f8dcbe5dc340 (diff) |
Fix merge conflict.
Diffstat (limited to 'src/libs/mynewt-nimble/apps/blecent/syscfg.yml')
0 files changed, 0 insertions, 0 deletions