Bitbucket cannot automatically merge this request.
The commits that make up this pull request have been removed.
Bitbucket cannot automatically merge this request due to conflicts.
Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:
git checkout next
git remote add f5soh/librepilot https://bitbucket.org/f5soh/librepilot.git
git fetch f5soh/librepilot
git merge --no-ff -m 'Merged in f5soh/librepilot/LP-514_Dshot_Wizard (pull request #490)' remotes/f5soh/librepilot/LP-514_Dshot_Wizard
LP-514 Add new Esc icons for Wizard
LP-514 Add DShot150/600/1200 and OneShot42/MultiShot Esc support to Wizard
New minimal default Esc for Multirotors with standard Esc at 300Hz instead of 50Hz.