summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/docsite/_themes/sphinx_rtd_theme/footer.html7
1 files changed, 0 insertions, 7 deletions
diff --git a/docs/docsite/_themes/sphinx_rtd_theme/footer.html b/docs/docsite/_themes/sphinx_rtd_theme/footer.html
index fc64a9ac38..a1bc26d618 100644
--- 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>