From fb843663271200062e90fffa179929dd8516c068 Mon Sep 17 00:00:00 2001
From: timothymctim <timothymctim@users.noreply.github.com>
Date: Tue, 11 Feb 2020 16:52:42 +0000
Subject: [PATCH] Fix unmerged merge conflict (#67250)

---
 docs/docsite/_themes/sphinx_rtd_theme/footer.html | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/docs/docsite/_themes/sphinx_rtd_theme/footer.html b/docs/docsite/_themes/sphinx_rtd_theme/footer.html
index fc64a9ac38b..a1bc26d6183 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>