Fix unmerged merge conflict (#67250)

5 years ago · fb84366327
parent 3bc7796035
commit fb84366327
1 changed files with 0 additions and 7 deletions
--- a/docs/docsite/_themes/sphinx_rtd_theme/footer.html
+++ b/docs/docsite/_themes/sphinx_rtd_theme/footer.html
@ -22,12 +22,6 @@
  _st('install','yABGvz2N8PwcwBxyfzUc','2.0.0');
 </script>

-<<<<<<< HEAD
-  <p>
-  {%- if last_updated %}{% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}<br/>{% endif %}
-  Copyright © 2018 Red Hat, Inc. <br/>
-  </p>
-=======
  <div role="contentinfo">
    <p>
    {%- if show_copyright %}
@ -65,5 +59,4 @@
  {%- endif %}

  {%- block extrafooter %} {% endblock %}
->>>>>>> 912c493... Backport/2.8/theme (#62611)
 </footer>