merge conflict

diff --cc scss/components/_button.scss
index df2d337282b5cfd935641f7a9dc523dcff5c7f32,0d1fccbe8bd44e303e3411c0103449bd8a8b6b63..a643fecd0188632232816358167340639c58e226
--- 1/scss/components/_button.scss
--- 2/scss/components/_button.scss
+++ b/scss/components/_button.scss
@@@ -317,9 -317,10 +317,9 @@@ table.button.warning:hover 
    // Then the mixin calls itself with just the color to obtain the color styles
    @if $class {
      &.#{$class} {
-         @include hollowButton($color);
+         @include hollow-button($color);
      }
 -  }
 -  @else {
 +  } @else {
      table tr td a {
        border:1px solid $color;
        color: $color;
@@@ -356,9 -350,9 +356,18 @@@ table.button.hollow 
      table a {border-radius:$global-rounded;}
    }
  
 -}
++<<<<<<< HEAD
 +  @include hollowButton($primary-color);
 +  @include hollowButton($secondary-color,'secondary');
 +  @include hollowButton($alert-color,'alert');
 +  @include hollowButton($warning-color,'warning');
 +  @include hollowButton($success-color,'success');
 +}
++=======
+   @include hollow-button($primary-color);
+   @include hollow-button($secondary-color,'secondary');
+   @include hollow-button($alert-color,'alert');
+   @include hollow-button($warning-color,'warning');
+   @include hollow-button($success-color,'success');
++}
++>>>>>>> eb4c27848b700262ae2b222a2e588c0b0bcdd989