Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-16 21:05:28 +03:00
Code 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

2
js/backup_restore.js
View file

@ -772,4 +772,4 @@ function configuration_restore(callback) {
upload(); upload();
} }
}

4
js/data_storage.js
View file

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

6
tabs/configuration.html
View file

@ -290,16 +290,10 @@
<div class="gui_box grey"> <div class="gui_box grey">
<div class="gui_box_titlebar"> <div class="gui_box_titlebar">
<div class="spacer_box_title" i18n="configurationRSSI"></div> <div class="spacer_box_title" i18n="configurationRSSI"></div>
<<<<<<< HEAD
<div class="helpicon cf_tip">
<div class="cf_tooltiptext" i18n="configHelp1" style="display:none;"></div>
=======
<div class="helpicon cf_tip"> <div class="helpicon cf_tip">
<div class="cf_tooltiptext" i18n="configurationRSSIHelp" style="display:none;"></div> <div class="cf_tooltiptext" i18n="configurationRSSIHelp" style="display:none;"></div>
</div> </div>
>>>>>>> cleanflight/development
</div> </div>
</div>
<div class="spacer_box"> <div class="spacer_box">
<table cellpadding="0" cellspacing="0"> <table cellpadding="0" cellspacing="0">
<thead> <thead>