From d4969d73a15289294e1886d611e29f5b202d9ac1 Mon Sep 17 00:00:00 2001
From: skaman82 <skaman82@users.noreply.github.com>
Date: Tue, 15 Dec 2015 01:59:58 +0100
Subject: [PATCH] resolving conflicts

---
 js/backup_restore.js    | 2 +-
 js/data_storage.js      | 4 +---
 tabs/configuration.html | 6 ------
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/js/backup_restore.js b/js/backup_restore.js
index 8fee9873..ebf0b505 100644
--- a/js/backup_restore.js
+++ b/js/backup_restore.js
@@ -772,4 +772,4 @@ function configuration_restore(callback) {
 
         upload();
     }
-}
+
diff --git a/js/data_storage.js b/js/data_storage.js
index d6c54aec..67c5d339 100755
--- a/js/data_storage.js
+++ b/js/data_storage.js
@@ -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
diff --git a/tabs/configuration.html b/tabs/configuration.html
index ec6bb3f3..2746cab5 100644
--- a/tabs/configuration.html
+++ b/tabs/configuration.html
@@ -290,16 +290,10 @@
             <div class="gui_box grey">
                 <div class="gui_box_titlebar">
                     <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="cf_tooltiptext" i18n="configurationRSSIHelp" style="display:none;"></div>
                         </div>
->>>>>>> cleanflight/development
                     </div>
-                </div>
                 <div class="spacer_box">
                     <table cellpadding="0" cellspacing="0">
                         <thead>