fix bad merge

2016-02-03 22:56:37 +01:00 · 2016-02-03 22:56:37 +01:00 · 1545b89d68
commit 1545b89d68
parent c6e1f2bf18
1 changed files with 0 additions and 6 deletions
--- a/src/scss/cdb-utilities/helpers.scss
+++ b/src/scss/cdb-utilities/helpers.scss
@ -30,11 +30,6 @@
 .u-lSpace--xl {
  margin-left: 12px;
 }
-<<<<<<< HEAD
-.u-bSpace--m {
-  margin-bottom: 8px;
-}
-=======
 .u-bSpace {
  margin-bottom: 4px;
 }
@ -42,7 +37,6 @@
  margin-bottom: 8px;
 }

->>>>>>> ece198db8f1ecfae1a76ecaf706f2afebec3e0d9
 .u-iBlock {
  @include inline-block();
 }