From b94c4ba3aa938ea50ef48e808af5fed7883850dc Mon Sep 17 00:00:00 2001
From: Matthew Grove <matthew@grove.gq>
Date: Tue, 5 Mar 2019 21:55:09 +0000
Subject: [PATCH] Update code

---
 _includes/article-page-head.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/_includes/article-page-head.html b/_includes/article-page-head.html
index 476737f..f22b9ce 100644
--- a/_includes/article-page-head.html
+++ b/_includes/article-page-head.html
@@ -1,9 +1,5 @@
 <link href="/css/slick.css" rel="stylesheet">
 <link href="/css/slick-theme.css" rel="stylesheet">
-<<<<<<< HEAD
-=======
-<!-- <script src="/js/jquery-migrate-1.4.1.min.js"></script> -->
->>>>>>> 8269352852ba921163966368847de473d11254aa
 <script src="/js/jquery-migrate-3.0.0.min.js"></script>
 <script src="/js/slick.min.js"></script>
 <link href="/css/article-page.css" rel="stylesheet">