Resolve merge conflicts

82eedaaf · Andrew Sliwinski · 8a2ac5f2 · 82eedaaf
Commit 82eedaaf authored Nov 18, 2015 by Andrew Sliwinski
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

src/views/about/about.scss src/views/about/about.scss +2 -0

No files found.
--- a/src/views/about/about.scss
+++ b/src/views/about/about.scss
+@import "../../colors";
 #view {
    .masthead {
        display: flex;