Merge branch 'refs/heads/integration'

3 files changed, 1 insertions, 1 deletions

diff --git a/js/components/layout/tool-button.reel/tool-button.css b/js/components/layout/tool-button.reel/tool-button.css
index 46152424..46152424 100644..100755
--- a/js/components/layout/tool-button.reel/tool-button.css
+++ b/js/components/layout/tool-button.reel/tool-button.css
diff --git a/js/components/layout/tool-button.reel/tool-button.html b/js/components/layout/tool-button.reel/tool-button.html
index 81a9b927..81a9b927 100644..100755
--- a/js/components/layout/tool-button.reel/tool-button.html
+++ b/js/components/layout/tool-button.reel/tool-button.html
diff --git a/js/components/layout/tool-button.reel/tool-button.js b/js/components/layout/tool-button.reel/tool-button.js
index 509512d0..72f46830 100644..100755
--- a/js/components/layout/tool-button.reel/tool-button.js
+++ b/js/components/layout/tool-button.reel/tool-button.js
@@ -42,7 +42,7 @@ exports.ToolButton = Montage.create(Component, {
     },
 
     _currentSubSelected: { value: 0},
-    
+
     prepareForDraw: {
         enumerable: false,
         value: function() {