Removed merge artefacts

betaflight · Sep 7, 2016 · edad524 · edad524
1 parent 9d79675
commit edad524
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/js/RateCurve.js b/js/RateCurve.js
@@ -61,14 +61,11 @@ var RateCurve = function (useLegacyCurve) {
 RateCurve.prototype.rcCommandRawToDegreesPerSecond = function (rcData, rate, rcRate, rcExpo, superExpoActive, deadband) {
     var angleRate;
     if (rate !== undefined && rcRate !== undefined && rcExpo !== undefined) {
-<<<<<<< f9ea2c8ee4e9635ef6191b0d8b160dbb44128d82
         if (rcRate > 2) {
             rcRate = rcRate + (rcRate - 2) * 14.54;
         }
-        var inputValue = this.rcCommand(rcData, rcRate);
-=======
+
         var inputValue = this.rcCommand(rcData, rcRate, deadband);
->>>>>>> Added deadband to curves and model calculations. Also fixed rates curve bug in pre 2.8.
         var maxRc = 500 * rcRate;
 
         var expoPower;