From: RafiBomb <rafi@zurb.com>
Date: Mon, 7 Mar 2016 18:51:20 +0000 (-0800)
Subject: fix merge conflicts
X-Git-Tag: v2.0.0-rc.3~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ee68bd91e16491837c4653218a6d7a9aaa8a90f;p=thirdparty%2Ffoundation%2Ffoundation-emails.git

fix merge conflicts
---

2ee68bd91e16491837c4653218a6d7a9aaa8a90f
diff --cc scss/grid/_grid.scss
index ca539ca1,b74a5589..ef174298
--- a/scss/grid/_grid.scss
+++ b/scss/grid/_grid.scss
@@@ -16,15 -16,11 +16,11 @@@ $wrapper-padding-top: 10px !default
  
  /// Default padding for the bottom of a column.
  /// @type Number
 -$column-padding-bottom: 10px !default;
 +$column-padding-bottom: 16px !default;
  
- /// Default gutter for the grid system
- /// @type Number
- $grid-column-gutter: 16px !default;
- 
  /// Default padding for the right of a sub-column.
  /// @type Number
- $sub-column-padding-right: $grid-column-gutter / 2 !default;
+ $sub-column-padding-right: $global-gutter / 2 !default;
  
  /// Body background color.
  /// @type Length