Merging conflicts

This commit is contained in:
Mike Gioia 2016-12-14 18:24:47 -05:00
commit eda058bee6

View File

@ -101,7 +101,7 @@
/** /**
* Fixed width */ * Fixed width */
.ss-fw { .ss-fw {
width: 1.28571429em; width: 1.2857142857142858em;
text-align: center; text-align: center;
} }
/** /**