From 1befe817c26fb6a923c8d85b5a4ffcb18521b240 Mon Sep 17 00:00:00 2001
From: Darius Kazemi <darius.kazemi@gmail.com>
Date: Sat, 31 Aug 2019 16:50:29 -0700
Subject: [PATCH] Fixing stray merge cruft

---
 app/javascript/styles/macaron/diff.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/javascript/styles/macaron/diff.scss b/app/javascript/styles/macaron/diff.scss
index 60dd68cb8..d513dbdee 100644
--- a/app/javascript/styles/macaron/diff.scss
+++ b/app/javascript/styles/macaron/diff.scss
@@ -155,7 +155,6 @@ html {
 
 .muted .poll__chart {
   background: rgba($purple, 0.8);
->>>>>>> 3da7ff7230a4de11f87724aa1d33d776f0616706
 }
 
 .poll__chart.leading {