Fixing stray merge cruft

2019-08-31 16:50:29 -07:00 · 2019-08-31 16:50:29 -07:00 · 1befe817c2
commit 1befe817c2
parent 168d0b304f
1 changed files with 0 additions and 1 deletions
--- 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 {