Fix conflict in common.scss

5bf9465c · Annabel Dunstone Gray · 12b20883 · 5bf9465c
Commit 5bf9465c authored Aug 15, 2018 by Annabel Dunstone Gray
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/stylesheets/framework/common.scss app/assets/stylesheets/framework/common.scss +0 -3

No files found.
--- 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 {