From: Geoff Kimball <geoff@zurb.com>
Date: Mon, 1 Feb 2016 22:07:53 +0000 (-0800)
Subject: Resolve leftover merge conflict in flex grid Sass
X-Git-Tag: v6.2.0-rc.1~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7d16350abf4f7315656709bb29bd204d899cc44;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Resolve leftover merge conflict in flex grid Sass
---

diff --git a/scss/grid/_flex-grid.scss b/scss/grid/_flex-grid.scss
index a3ef6620f..afca99995 100644
--- a/scss/grid/_flex-grid.scss
+++ b/scss/grid/_flex-grid.scss
@@ -234,19 +234,8 @@
     }
 
     .#{$-zf-size}-uncollapse {
-<<<<<<< HEAD
       $gutter: -zf-get-bp-val($grid-column-gutter, $-zf-size);
 
-=======
-      $gutter: null;
-
-      @if $grid-column-gutter {
-        $gutter: $grid-column-gutter;
-      }
-      @else {
-        $gutter: -zf-get-bp-val($grid-column-responsive-gutter, $-zf-size);
-      }
->>>>>>> develop
       > .column { @include grid-col-uncollapse($gutter); }
     }
   }