Resolve leftover merge conflict in flex grid Sass

diff --git a/scss/grid/_flex-grid.scss b/scss/grid/_flex-grid.scss
index a3ef6620f98ff68b573997b12f720fc4cdc55fc6..afca99995d66715c9d91dbed10a81f2e1b3c670c 100644 (file)
--- 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); }
     }
   }