From f07cea070e085816948914d1a09fbdef9382c9bb Mon Sep 17 00:00:00 2001
From: skaman82 <skaman82@users.noreply.github.com>
Date: Thu, 17 Dec 2015 23:50:51 +0100
Subject: [PATCH] error fix

---
 js/msp.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/js/msp.js b/js/msp.js
index 6074a5f8..56ace049 100644
--- a/js/msp.js
+++ b/js/msp.js
@@ -1353,7 +1353,6 @@ MSP.sendServoConfigurations = function(onCompleteCallback) {
     }
 
 
->>>>>>> cleanflight/development
     function send_next_servo_configuration() {
         
         var buffer = [];