Fix rebase error

diff --git a/scss/components/_switch.scss b/scss/components/_switch.scss
index 3b3f0dd72cb0af56482839602dc0b62160fb0cd6..10b8203df96c9be776b602d4f279d35ae089bee0 100644 (file)
--- a/scss/components/_switch.scss
+++ b/scss/components/_switch.scss
@@ -81,7 +81,6 @@ $switch-paddle-transition: all 0.25s ease-out !default;
 
 /// Adds styles for the background and paddle of a switch. Apply this to a `<label>` within a switch.
 @mixin switch-paddle {
-<<<<<<< HEAD
   $switch-width: $switch-height * 2;
   $paddle-height: $switch-height - ($switch-paddle-offset * 2);
   $paddle-width: $switch-height - ($switch-paddle-offset * 2);