Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-17 13:25:24 +03:00
Code Issues Wiki Activity

resolving conflicts

Browse source
This commit is contained in:
skaman82 2015-12-15 01:59:58 +01:00
parent 2d6feb0e6a
commit d4969d73a1
3 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
js/data_storage.js
View file

@ -179,14 +179,13 @@ var DATAFLASH = {
usedSize: 0
};
<<<<<<< HEAD
var RC_controls = {
deadband: 0,
yaw_deadband: 0,
alt_hold_deadband: 0,
alt_hold_fast_change: 0
};
=======
var RX_CONFIG = {
serialrx_provider: 0,
maxcheck: 0,
@ -207,4 +206,3 @@ var FAILSAFE_CONFIG = {
};
var RXFAIL_CONFIG = [];
>>>>>>> cleanflight/development