Fix merge conflict in prev_next.html

diff --cc mediagoblin/templates/mediagoblin/user_pages/media.html
Simple merge

diff --cc mediagoblin/templates/mediagoblin/utils/prev_next.html
index 83d83ad63c92555da01d9c705c3da9fdd84ada9b,f1175ce4803473231af65c06a0aae9bccf7d916a..9e262ed946df17dffc3011acb9df2ce72474d446
--- 1/mediagoblin/templates/mediagoblin/utils/prev_next.html
--- 2/mediagoblin/templates/mediagoblin/utils/prev_next.html
+++ b/mediagoblin/templates/mediagoblin/utils/prev_next.html
@@@ -21,26 -21,28 +21,28 @@@
  {% set next_entry_url = media.url_to_next(request.urlgen) %}
  
  {% if prev_entry_url or next_entry_url %}
-   {# There are no previous entries for the very first media entry #}
-   {% if prev_entry_url %}
-     <a class="navigation_button navigation_left" href="{{ prev_entry_url }}">
-       &larr; {% trans %}newer{% endtrans %}
-     </a>
-   {% else %}
-     {# This is the first entry. display greyed-out 'previous' image #}
-     <p class="navigation_button navigation_left">
-       &larr; {% trans %}newer{% endtrans %}
-     </p>
-   {% endif %}
-   {# Likewise, this could be the very last media entry #}
-   {% if next_entry_url %}
-     <a class="navigation_button navigation_right" href="{{ next_entry_url }}">
-       {% trans %}older{% endtrans %} &rarr;
-     </a>
-   {% else %}
-     {# This is the last entry. display greyed-out 'next' image #}
-     <p class="navigation_button navigation_right">
-       {% trans %}older{% endtrans %} &rarr;
-     </p>
-   {% endif %}
+   <div class="navigation">
+    {# There are no previous entries for the very first media entry #}
+     {% if prev_entry_url %}
+       <a class="navigation_button navigation_left" href="{{ prev_entry_url }}">
+         &larr; {% trans %}newer{% endtrans %}
+       </a>
+     {% else %}
+       {# This is the first entry. display greyed-out 'previous' image #}
+       <p class="navigation_button navigation_left">
+         &larr; {% trans %}newer{% endtrans %}
+       </p>
+     {% endif %}
+     {# Likewise, this could be the very last media entry #}
+     {% if next_entry_url %}
 -      <a class="navigation_button" href="{{ next_entry_url }}">
++      <a class="navigation_button navigation_right" href="{{ next_entry_url }}">
+         {% trans %}older{% endtrans %} &rarr;
+       </a>
+     {% else %}
+       {# This is the last entry. display greyed-out 'next' image #}
 -      <p class="navigation_button">
++      <p class="navigation_button navigation_right">
+         {% trans %}older{% endtrans %} &rarr;
+       </p>
+     {% endif %}
+   </div>
  {% endif %}