Skip to content

Instantly share code, notes, and snippets.

@jgmize
jgmize / merge_conflict
Created February 12, 2014 21:38
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 %}