Fix conflict in common.scss

38d398d1 · Annabel Dunstone Gray · 0d3a87d4 · 38d398d1
Unverified Commit 38d398d1 authored 6 years ago by Annabel Dunstone Gray
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -115,13 +115,10 @@ hr {

 .author-link {
  color: $blue-600;
-<<<<<<< HEAD
 }

 .author-link:hover {
  text-decoration: none;
-=======
->>>>>>> upstream/master
 }

 .back-link {