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

fix for merge conflict
---

2ca0327ffe237e9efb9a150e1874167829f303ab
diff --cc testing/src/assets/scss/_settings.scss
index ee95ad84,466e67b9..8955d29b
--- a/testing/src/assets/scss/_settings.scss
+++ b/testing/src/assets/scss/_settings.scss
@@@ -42,9 -40,10 +42,13 @@@ $global-breakpoint: $global-width + $gl
  // -------
  
  $grid-column-count: 12;
 -$wrapper-padding-top: 10px;
  $column-padding-bottom: 16px;
  $sub-column-padding-right: $global-gutter / 2;
++<<<<<<< HEAD
 +$body-background: $light-gray;
++=======
+ $body-background-color: $light-gray;
++>>>>>>> 7a165d7b7ecc2c99b49b0b154c311f520c8a6b74
  
  // 3. Block Grid
  // -------------