scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-02-17 00:21:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Resolve merge conflicts

Browse source
This commit is contained in:
Andrew Sliwinski 2015-11-18 20:06:54 -05:00
parent 8a2ac5f24e
commit 82eedaaf13
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/views/about/about.scss
View file

@ -1,3 +1,5 @@
@import "../../colors";
#view {
.masthead {
display: flex;