fixing conflict.

This commit is contained in:
Jacob Schatz
2015-12-23 09:10:16 -05:00
+1 -1
View File
@@ -376,7 +376,7 @@ table {
.center-top-menu, .left-top-menu {
@include nav-menu;
text-align: center;
text-align: left;
margin-top: 5px;
margin-bottom: $gl-padding;
height: auto;