merge default decorator for button

Jimgskoop · Oct 30, 2012 · 64bfb02 · 64bfb02
1 parent 7601534
commit 64bfb02
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/scripts/components/Button/decorators/default.js b/scripts/components/Button/decorators/default.js
@@ -8,14 +8,10 @@
 function DefaultDecorator( settings ){
   return function( base ){
     var self = this;
-<<<<<<< HEAD
     this.$element.on( settings.on, _.throttle( function( event ){
       if( settings.preventDefault ){
         event.preventDefault();
       }
-=======
-    self.$element.on( settings.on, _.throttle( function( event ){
->>>>>>> 47eca0de395b18d4db5c2aed481b7608a645c5cd
       if( !self.$element.is( 'button' ) ){
         self.$element.focus();
       }