Merge remote-tracking branch 'origin/baseflight-configurator-development' into GUI-rework

Conflicts:
	README.md
	js/libraries/d3.min.js
	js/msp.js
	main.html

1 files changed, 3 insertions, 0 deletions

diff --git a/main.html b/main.html
index fe52f0a5..724d180c 100755
--- a/main.html
+++ b/main.html
@@ -38,7 +38,10 @@
         <script type="text/javascript" src="./js/libraries/q.js"></script>
         <script type="text/javascript" src="./js/libraries/google-analytics-bundle.js"></script>
         <script type="text/javascript" src="./js/libraries/jquery-2.1.3.min.js"></script>
+<<<<<<< HEAD
         <script type="text/javascript" src="./js/libraries/jquery-ui-1.11.2.min.js"></script>
+=======
+>>>>>>> origin/baseflight-configurator-development
         <script type="text/javascript" src="./js/libraries/d3.min.js"></script>
         <script type="text/javascript" src="./js/libraries/jquery.nouislider.all.min.js"></script>
         <script type="text/javascript" src="./js/libraries/three/three.min.js"></script>