From f05c8ed0d37608e1e21208c4f860417a702f70e2 Mon Sep 17 00:00:00 2001
From: Owen Buckley <owenbuckley13@gmail.com>
Date: Tue, 14 Jul 2020 22:04:09 -0400
Subject: [PATCH] rebase fix

---
 src/pages/blog/2020/04/07/index.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/pages/blog/2020/04/07/index.md b/src/pages/blog/2020/04/07/index.md
index 580ed98..bb4ddce 100644
--- a/src/pages/blog/2020/04/07/index.md
+++ b/src/pages/blog/2020/04/07/index.md
@@ -6,11 +6,7 @@ description: 'Local git repository viewer'
 image: '/assets/blog-post-images/git.png'
 ---
 
-<<<<<<< HEAD
 Made this a little while ago but felt it would be fun to share, called <a href="https://github.com/thescientist13/git-explorer" target="_blank" rel="noopener" onclick="getOutboundLink('https://github.com/thescientist13/git-explorer');"><b>Git Explorer</b>.</a>
-=======
-Made this a little while ago but felt it would be fun to share, called <a href="https://github.com/thescientist13/git-explorer" target="_blank" rel="noopener" onclick="getOutboundLink('https://github.com/thescientist13/git-explorer');"><b>Git Explorer</b>.</a>
->>>>>>> convert 2018 posts to just markdown
 
 It is a NodeJS package you can install from NPM that will provide a nice browser based comparison tool for any `git` repo on your local machine.