Commit 5bf9465c authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Fix conflict in common.scss

parent 12b20883
...@@ -115,13 +115,10 @@ hr { ...@@ -115,13 +115,10 @@ hr {
.author-link { .author-link {
color: $blue-600; color: $blue-600;
<<<<<<< HEAD
} }
.author-link:hover { .author-link:hover {
text-decoration: none; text-decoration: none;
=======
>>>>>>> upstream/master
} }
.back-link { .back-link {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment