From: RafiBomb <rafi@zurb.com>
Date: Wed, 19 Apr 2017 22:05:30 +0000 (-0700)
Subject: fixes merge conflict
X-Git-Tag: v2.3.0~7^2~34^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbb113bf20b49a285e91bbc6de8a943683bf4afc;p=thirdparty%2Ffoundation%2Ffoundation-emails.git

fixes merge conflict
---

dbb113bf20b49a285e91bbc6de8a943683bf4afc
diff --cc docs/partials/footer.html
index f60d1eb9,de015864..f344f78c
--- a/docs/partials/footer.html
+++ b/docs/partials/footer.html
@@@ -93,13 -73,13 +73,13 @@@
    <div class="row">
      <div class="medium-4 medium-push-8 columns">
        <ul class="home-social">
-           <li><a href="http://www.youtube.com/ZURB" class="youtube"></a></li>
-           <li><a href="http://www.twitter.com/ZURB" class="twitter"></a></li>
-           <li><a href="http://www.facebook.com/ZURB" class="facebook"></a></li>
-           <li><a href="http://zurb.com/contact" class="mail"></a></li>
-         </ul>
+         <li><a href="http://www.youtube.com/ZURB" class="youtube"></a></li>
+         <li><a href="http://www.twitter.com/ZURB" class="twitter"></a></li>
+         <li><a href="http://www.facebook.com/ZURB" class="facebook"></a></li>
+         <li><a href="http://zurb.com/contact" class="mail"></a></li>
+       </ul>
 -    </div>
 -    <div class="medium-8 medium-pull-4 columns">
 +     </div>
 +     <div class="medium-8 medium-pull-4 columns">
          <a href="http://www.zurb.com" class="zurb-logo regular"></a>
          <ul class="zurb-links">
            <li><a href="http://zurb.com/about">About</a></li>