merge conflicts

css/font-awesome.css

@@ -45,8 +45,8 @@
 /* makes the font 33% larger relative to the icon container */
 .fa-lg {
   font-size: 1.3333333333333333em;
-  vertical-align: -15%;
   line-height: 0.75em;
+  vertical-align: -15%;
 }
 /* increased font size for icon-lg */
 .fa-fixed-width {

css/font-awesome.min.css

@@ -1,5 +1,5 @@
 @font-face{font-family:'FontAwesome';src:url('../fonts/FontAwesome.otf') format('opentype');font-weight:normal;font-style:normal;}.fa{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;}
-.fa-lg{font-size:1.3333333333333333em;vertical-align:-15%;line-height:0.75em;}
+.fa-lg{font-size:1.3333333333333333em;line-height:0.75em;vertical-align:-15%;}
 .fa-fixed-width{width:1.1428571428571428em;padding-right:0.2857142857142857em;text-align:right;}.fa-fixed-width.fa-lg{width:1.4285714285714286em;}
 .fa-ul{padding-left:0;margin-left:2.142857142857143em;list-style-type:none;}.fa-ul>li{position:relative;}
 .fa-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;top:0.14285714285714285em;text-align:center;}.fa-li.fa-lg{left:-1.8571428571428572em;}

less/core.less

@@ -9,8 +9,8 @@
 /* makes the font 33% larger relative to the icon container */
 .fa-lg {
   font-size: (4em / 3);
-  vertical-align: -15%;
   line-height: (3em / 4);
+  vertical-align: -15%;
 }
 /* increased font size for icon-lg */
 .fa-fixed-width {

src/assets/font-awesome/less/core.less

@@ -11,8 +11,8 @@
 /* makes the font 33% larger relative to the icon container */
 .{{ site.fontawesome.css_prefix }}-lg {
   font-size: (4em / 3);
-  vertical-align: -15%;
   line-height: (3em / 4);
+  vertical-align: -15%;
 }
 /* increased font size for icon-lg */
 .{{ site.fontawesome.css_prefix }}-fixed-width {