Fixed merge conflicts.

This commit is contained in:
Konstantin Obenland 2015-01-14 09:35:02 -08:00
commit ec2a5e212a
15 changed files with 87 additions and 121 deletions

View file

@ -7,7 +7,8 @@
// Center block
@mixin center-block {
display: block;
margin: 0 auto;
margin-left: auto;
margin-right: auto;
}
// Clearfix