fixed merge conflict

diff --git a/scss/foundation/components/_buttons.scss b/scss/foundation/components/_buttons.scss
index 4e35a7f375140b231e41d85a8b7315cdf2e4a811..d6a5177df64ed7547d4fbe7dc0ee8468a08fd77e 100644 (file)
--- a/scss/foundation/components/_buttons.scss
+++ b/scss/foundation/components/_buttons.scss
@@ -130,7 +130,7 @@ $button-disabled-opacity: 0.7 !default;
 // $bg - Primary color set in settings file. Default: $primary-color.
 // $radius - If true, set to button radius which is $global-radius || explicitly set radius amount in px (ex. $radius:10px). Default: false
 // $disabled - We can set $disabled:true to create a disabled transparent button. Default: false
-@mixin button-style($bg:$primary-color, $radius:true, $disabled:false) {
+@mixin button-style($bg:$primary-color, $radius:false, $disabled:false) {
 
   // We control which background styles are used,
   // these can be removed by setting $bg:false
@@ -233,4 +233,4 @@ $button-disabled-opacity: 0.7 !default;
       }
     }
   }
-}
+}
\ No newline at end of file