Update _config.yml

3 years ago · 37fe8ca412
parent d02f668309
commit 37fe8ca412
1 changed files with 0 additions and 1 deletions
--- a/_config.yml
+++ b/_config.yml
@ -42,7 +42,6 @@ aux_links:
 # appears at the bottom of every page's main content
 footer_content: "Copyright &copy; 2017-2019 Patrick Marsceill. Distributed by an <a href=\"https://github.com/pmarsceill/just-the-docs/tree/master/LICENSE.txt\">MIT license.</a>"

-<<<<<<< HEAD
 # Footer last edited timestamp
 last_edit_timestamp: true # show or hide edit time - page must have `last_modified_date` defined in the frontmatter
 last_edit_time_format: "%b %e %Y at %I:%M %p" # uses ruby's time format: https://ruby-doc.org/stdlib-2.7.0/libdoc/time/rdoc/Time.html