merge conflict

merge_conflict

  {% if show_mobile %}
    <small class="download-other os_android">
      <a href="https://support.mozilla.org/kb/will-firefox-work-my-mobile-device">{{ _('Supported Devices') }}</a> |
<<<<<<< HEAD
      <a href="{{ product_url('mobile', 'notes', build) }}">{{ _('What’s New') }}</a> |
      <a href="/en-US/legal/privacy/firefox.html">{{ _('Privacy') }}</a>
=======
      {% if build %}
        <a href="/en-US/mobile/{{ build }}/notes">{{ _('What’s New') }}</a> |
      {% else %}
        <a href="/en-US/mobile/notes">{{ _('What’s New') }}</a> |
      {% endif %}
      <a href="{{ url('privacy.firefox.notice') }}">{{ _('Privacy') }}</a>
>>>>>>> faef5e14d523e062e98d69f4fe7aefc2f82ef6d3
    </small>
  {% endif %}
  {% if show_desktop %}
    <small class="download-other os_linux os_osx os_windows">
<<<<<<< HEAD
      <a href="{{ product_url('firefox', 'all', build) }}">{{ _('Systems &amp; Languages') }}</a> |
      <a href="{{ product_url('firefox', 'notes', build) }}">{{ _('What’s New') }}</a> |
      <a href="/en-US/legal/privacy/firefox.html">{{ _('Privacy') }}</a>
=======
      {% if build %}
        <a href="/en-US/firefox/all-{{ build }}.html">{{ _('Systems &amp; Languages') }}</a> |
        <a href="/en-US/firefox/{{ build }}/notes">{{ _('What’s New') }}</a> |
      {% else %}
        <a href="/en-US/firefox/all">{{ _('Systems &amp; Languages') }}</a> |
        <a href="/en-US/firefox/notes">{{ _('What’s New') }}</a> |
      {% endif %}
      <a href="{{ url('privacy.firefox.notice') }}">{{ _('Privacy') }}</a>
>>>>>>> faef5e14d523e062e98d69f4fe7aefc2f82ef6d3
    </small>
  {% endif %}
</div>