Resolve merge conflicts in pull request #7131

diff --cc scss/forms/_text.scss
Simple merge

diff --cc scss/grid/_column.scss
index 7b50df572e6abf45a5142a60f7b092516ac5026b,009176f54b3eb9027ae61fc4d01ff4f343eda8eb..abf272cecc364bd9bce8b36d185840fac05a4c1b
--- 1/scss/grid/_column.scss
--- 2/scss/grid/_column.scss
+++ b/scss/grid/_column.scss
@@@ -12,9 -12,9 +12,9 @@@
  ///   Width of the column. Accepts multiple values:
  ///   - A percentage value will make the column that exact size.
  ///   - A single digit will make the column span that number of columns wide, taking into account the column count of the parent row.
- ///   - A string of the format "x of y" will make a column that is *x* columns wide, assuming *y* total columns for the parent.
+ ///   - A string of the format “x of y” will make a column that is *x* columns wide, assuming *y* total columns for the parent.
  ///
 -/// @return {Number} A calculated percentage value.
 +/// @returns {Number} A calculated percentage value.
  @function grid-column($columns) {
    $width: 0%;
  

diff --cc scss/settings/_settings.scss
Simple merge

diff --cc scss/util/_breakpoint.scss
index 524ba9753bf5b6553f6e3b5cccc5903846910ca7,38fb6218ffff82658e6648f2981d75045fc4f0e7..f7e22b649c06554f709c3ad5add6925b19368e47
--- 1/scss/util/_breakpoint.scss
--- 2/scss/util/_breakpoint.scss
+++ b/scss/util/_breakpoint.scss
@@@ -186,8 -180,3 +186,8 @@@ $breakpoint-classes: (small medium larg
      @return nth($values, $i);
    }
  }
-   font-family: "#{-zf-bp-serialize($breakpoints)}";
 +
 +// These styles are applied to <meta> tags, which are read by the Foundation JavaScript
 +.foundation-mq {
++  font-family: '#{-zf-bp-serialize($breakpoints)}';
 +}

diff --cc scss/util/_mixins.scss
Simple merge

diff --cc scss/util/_selector.scss
Simple merge