From 5646c4d3752c66cefe4aac6b346bbc5d7d0a8aa4 2017-08-16 04:00:16
From: Joshua Simmons <i@joshuasimmons.name>
Date: 2017-08-16 04:00:16
Subject: [PATCH] css fix?

---

diff --git a/static/scss/custom.scss b/static/scss/custom.scss
index 8d3550b062d17aa85f04984c0e7af5daa8d65a62..276eb9cff5d382e62ccea60b5a184db50670f527 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;