From 37fe8ca4123b23e00b670e8d466ee5acef8a7e31 Mon Sep 17 00:00:00 2001
From: Patrick Marsceill <pmarsceill@users.noreply.github.com>
Date: Fri, 24 Apr 2020 15:52:19 -0400
Subject: [PATCH] Update _config.yml

---
 _config.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/_config.yml b/_config.yml
index fe59457..7a48a70 100644
--- 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