From 5646c4d3752c66cefe4aac6b346bbc5d7d0a8aa4 Mon Sep 17 00:00:00 2001
From: Joshua Simmons <i@joshuasimmons.name>
Date: Tue, 15 Aug 2017 21:00:16 -0700
Subject: [PATCH] css fix?

---
 static/scss/custom.scss | 2 --
 1 file changed, 2 deletions(-)

diff --git a/static/scss/custom.scss b/static/scss/custom.scss
index 8d3550b..276eb9c 100644
--- a/static/scss/custom.scss
+++ b/static/scss/custom.scss
@@ -299,8 +299,6 @@ body:not(.home) {
     text-decoration: underline;
   }
 }
-<<<<<<< Updated upstream
-=======
 
 span.date {
   font-weight: 900;