autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixing stray merge cruft

Browse Source
This commit is contained in:
Darius Kazemi 2019-08-31 16:50:29 -07:00
parent 168d0b304f
commit 1befe817c2
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/javascript/styles/macaron/diff.scss
View File

@ -155,7 +155,6 @@ html {
.muted .poll__chart { .muted .poll__chart {
background: rgba($purple, 0.8); background: rgba($purple, 0.8);
>>>>>>> 3da7ff7230a4de11f87724aa1d33d776f0616706
} }
.poll__chart.leading { .poll__chart.leading {