From 8b32fafb69865545ca33fd3a23dc7076647a0b53 Mon Sep 17 00:00:00 2001
From: Nicolas Coden <nicolas@ncoden.fr>
Date: Wed, 9 Nov 2016 21:31:36 +0100
Subject: [PATCH] Fix rebase error

---
 scss/components/_switch.scss | 1 -
 1 file changed, 1 deletion(-)

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);
-- 
2.47.2