WIP: fix wrong merge...

see: https://github.com/jedie/django-reversion-compare/pull/28/files#r25516078

Author: jedie

reversion_compare/templates/reversion-compare/compare.html

@@ -16,13 +16,8 @@
 
 {% block breadcrumbs %}
     <div class="breadcrumbs">
-<<<<<<< HEAD
         <a href="{% url 'admin:index' %}">{% trans 'Home' %}</a> &rsaquo;
-        <a href="{% url "admin:app_list" app_label %}">{{app_label|capfirst|escape}}</a> &rsaquo;
-=======
-        <a href="{% url 'admin:index' %}">{% trans 'Home' %}</a> &rsaquo; 
         <a href="{% url 'admin:app_list' app_label %}">{{app_label|capfirst|escape}}</a> &rsaquo; 
->>>>>>> origin/master
         <a href="{{changelist_url}}">{{opts.verbose_name_plural|capfirst}}</a> &rsaquo;
         <a href="{{history_url}}">{% trans "History" %}</a> &rsaquo;
         {% blocktrans with opts.verbose_name_plural|escape as name %}Compare {{name}}{% endblocktrans %}
@@ -43,12 +38,8 @@
               {% endblock %}
             </ul>
         {% endblock %}
-<<<<<<< HEAD
-
-=======
 {% endcomment %}
 
->>>>>>> origin/master
         <p class="help">
             {% blocktrans with date1=version1.revision.date_created|date:_("DATETIME_FORMAT") date2=version2.revision.date_created|date:_("DATETIME_FORMAT") %}
                 Compare <strong>{{ date1 }}</strong> with <strong>{{ date2 }}</strong>: