diff options
| author | timothymctim <timothymctim@users.noreply.github.com> | 2020-02-11 16:52:42 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-11 10:52:42 -0600 |
| commit | fb843663271200062e90fffa179929dd8516c068 (patch) | |
| tree | eaf93f15453835fae3e69ecaac8ced84a469a78d | |
| parent | 3bc7796035f03605dd623015be73ec682c83f28c (diff) | |
| download | ansible-fb843663271200062e90fffa179929dd8516c068.tar.gz | |
Fix unmerged merge conflict (#67250)
| -rw-r--r-- | docs/docsite/_themes/sphinx_rtd_theme/footer.html | 7 |
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> |