From: Nicolas Coden <nicolas@ncoden.fr>
Date: Wed, 9 Nov 2016 20:31:36 +0000 (+0100)
Subject: Fix rebase error
X-Git-Tag: v6.3-rc1~18^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F9333%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Fix rebase error
---

diff --git a/scss/components/_switch.scss b/scss/components/_switch.scss
index 3b3f0dd72..10b8203df 100644
--- 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);